Updating Makefile

AllenDowney · AllenDowney · commit 6a578c7e1d99 · 2015-07-02T13:09:55.000-04:00
diff --git a/book/Makefile b/book/Makefile
@@ -19,68 +19,70 @@ PDFFLAGS = -dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress \
 all:	book.tex
 	makeindex book
 	pdflatex book
-	mv book.pdf thinkpython.pdf
-	evince thinkpython.pdf
+	mv book.pdf thinkpython2.pdf
+	evince thinkpython2.pdf
 
 hevea:	book.tex header.html footer.html
 	# replace the pdfs with eps
-	sed s/.pdf/.eps/g book.tex > thinkpython.tex
-	latex thinkpython
+	sed s/.pdf/.eps/g book.tex > thinkpython2.tex
+	latex thinkpython2
 	rm -rf html
 	mkdir html
-	hevea -fix -O -e latexonly htmlonly thinkpython
+	hevea -fix -O -e latexonly htmlonly thinkpython2
 # the following greps are a kludge to prevent imagen from seeing
 # the definitions in latexonly, and to avoid headers on the images
-	grep -v latexonly thinkpython.image.tex > a; mv a thinkpython.image.tex
-	grep -v fancyhdr thinkpython.image.tex > a; mv a thinkpython.image.tex
-	imagen -png thinkpython
-	hacha thinkpython.html
+	grep -v latexonly thinkpython2.image.tex > a; mv a thinkpython2.image.tex
+	grep -v fancyhdr thinkpython2.image.tex > a; mv a thinkpython2.image.tex
+	imagen -png thinkpython2
+	hacha thinkpython2.html
 	cp up.png next.png back.png html
-	mv index.html thinkpython.css thinkpython*.html thinkpython*.png *motif.gif html
+	mv index.html thinkpython2.css thinkpython2*.html thinkpython2*.png *motif.gif html
 
-DEST = /home/downey/public_html/greent/thinkpython
+DEST = /home/downey/public_html/greent/thinkpython2
 
 epub:
-	cd html; ebook-convert index.html thinkpython.epub
+	cd html; ebook-convert index.html thinkpython2.epub
 
 distrib:
 	rm -rf dist
 	mkdir dist dist/tex dist/tex/figs
-	rsync -a thinkpython.pdf html dist
+	rsync -a thinkpython2.pdf html dist
 	rsync -a Makefile book.tex latexonly htmlonly dist/tex
 	rsync -a figs/*.fig figs/*.pdf dist/tex/figs
-	cd dist; zip -r thinkpython.tex.zip tex
-	cd dist; zip -r thinkpython.html.zip html
+	cd dist; zip -r thinkpython2.tex.zip tex
+	cd dist; zip -r thinkpython2.html.zip html
 	rsync -a dist/* $(DEST)
 	chmod -R o+r $(DEST)/*
 	cd $(DEST)/..; sh back
 
+# UPDATE THE PATHS BELOW BEFORE RUNNING PLASTEX
+
 plastex:
 	# Before running plastex, we need the current directory in PYTHONPATH
 	# export PYTHONPATH=$PYTHONPATH:.
 	python Filist.py book.tex > book.plastex
-	rm -rf /home/downey/thinkpython/trunk/book
+	rm -rf /home/downey/thinkpython2/trunk/book
 	plastex --renderer=DocBook --theme=book --image-resolution=300 --filename=book.xml book.plastex
-	rm -rf /home/downey/thinkpython/trunk/book/.svn
+	rm -rf /home/downey/thinkpython2/trunk/book/.svn
 
 plastest:
 	# Before running plastex, we need the current directory in PYTHONPATH
 	# export PYTHONPATH=$PYTHONPATH:.
 	python Filist.py test.tex > test.plastex
-	rm -rf /home/downey/thinkpython/trunk/test
+	rm -rf /home/downey/thinkpython2/trunk/test
 	plastex --renderer=DocBook --theme=test --filename=test.xml test.plastex
-	rm -rf /home/downey/thinkpython/trunk/test/.svn
+	rm -rf /home/downey/thinkpython2/trunk/test/.svn
 
 xxe:
 	~/Downloads/xxe-perso-4_8_0/bin/xxe book/book.xml
 
-OREILLY = /home/downey/oreilly/thinkpython
+OREILLY = /home/downey/oreilly/thinkpython2
 
 oreilly:
 	rsync -a book.tex $(OREILLY)
 	rsync -a book/ $(OREILLY)
 	rsync -a figs/* $(OREILLY)/figs
-	rsync -a thinkpython.pdf $(OREILLY)/pdf
+	rsync -a thinkpython2.pdf $(OREILLY)/pdf
 
 clean:
 	rm -f *~ *.aux *.log *.dvi *.idx *.ilg *.ind *.toc
