projects
/
pwan.org.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resume typos
[pwan.org.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
dc452f8
..
7c52a0b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-13,8
+13,8
@@
FTP_USER=anonymous
FTP_TARGET_DIR=/
SSH_HOST=pwan.org
FTP_TARGET_DIR=/
SSH_HOST=pwan.org
-SSH_PORT=22
-SSH_USER
=jude
+SSH_PORT
?
=22
+SSH_USER
?=wrong
SSH_TARGET_DIR=/home/jude/pwan.org
S3_BUCKET=my_s3_bucket
SSH_TARGET_DIR=/home/jude/pwan.org
S3_BUCKET=my_s3_bucket
@@
-25,7
+25,7
@@
help:
@echo 'Makefile for a pelican Web site '
@echo ' '
@echo 'Usage: '
@echo 'Makefile for a pelican Web site '
@echo ' '
@echo 'Usage: '
- @echo ' make
html
(re)generate the web site '
+ @echo ' make
output
(re)generate the web site '
@echo ' make clean remove the generated files '
@echo ' make regenerate regenerate files upon modification '
@echo ' make publish generate using production settings '
@echo ' make clean remove the generated files '
@echo ' make regenerate regenerate files upon modification '
@echo ' make publish generate using production settings '
@@
-41,11
+41,15
@@
help:
@echo ' '
@echo ' '
-html: clean $(OUTPUTDIR)/index.html
+output: clean $(OUTPUTDIR)/index.html $(OUTPUTDIR)/pages/resume.pdf
$(OUTPUTDIR)/%.html:
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
$(OUTPUTDIR)/%.html:
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+$(OUTPUTDIR)/pages/resume.pdf: $(INPUTDIR)/pages/resume.rst
+ /usr/bin/rst2pdf $(INPUTDIR)/pages/resume.rst $(INPUTDIR)/pages/resume.pdf
+ cp $(INPUTDIR)/pages/resume.pdf $(OUTPUTDIR)/pages/resume.pdf
+
clean:
[ ! -d $(OUTPUTDIR) ] || find $(OUTPUTDIR) -mindepth 1 -delete
clean:
[ ! -d $(OUTPUTDIR) ] || find $(OUTPUTDIR) -mindepth 1 -delete
@@
-63,14
+67,16
@@
stopserver:
kill -9 `cat srv.pid`
@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
kill -9 `cat srv.pid`
@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
-publish:
+publish: pelican_publish $(OUTPUTDIR)/pages/resume.pdf
+
+pelican_publish:
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
ssh_upload: publish
scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
rsync_upload: publish
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
ssh_upload: publish
scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
rsync_upload: publish
- rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
+ rsync -e "
/usr/bin/
ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
dropbox_upload: publish
cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
dropbox_upload: publish
cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
@@
-85,4
+91,4
@@
github: publish
ghp-import $(OUTPUTDIR)
git push origin gh-pages
ghp-import $(OUTPUTDIR)
git push origin gh-pages
-.PHONY:
html
help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload github
+.PHONY:
output
help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload github