git.iko.soy/typeable/pandoc
on master help sign in
Reorganized Makefile target - now uses a subsidiary Makefile
c80f181fiddlosopher
Makefile+12−12
compare with master
unifiedsplit
@@ -368,27 +368,27 @@ website: $(MAIN) html
368 mkdir $(web_dest); \
368 mkdir $(web_dest); \
369 cp -r html $(web_dest)/doc; \
369 cp -r html $(web_dest)/doc; \
370 cp $(web_src)/*.css $(web_dest)/; \
370 cp $(web_src)/*.css $(web_dest)/; \
371+ cp $(web_src)/css $(web_dest)/; \
371− sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome | \
372+ sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > \
372− $(make_page) > $(web_dest)/osx-notes.html; \
373+ $(web_dest)/osx-notes.txt; \
373 sed -e '/^ --.*/d' -e 's#^# #g' changelog | \
374 sed -e '/^ --.*/d' -e 's#^# #g' changelog | \
374− sed -e 's/ \(pandoc (.*\)/## \1/g' | \
375+ sed -e 's/ \(pandoc (.*\)/## \1/g' > \
375− $(make_page) -T "Pandoc changelog" > $(web_dest)/changelog.html; \
376+ $(web_dest)/changelog.txt; \
376− $(make_page) README > $(web_dest)/README.html; \
377+ cp README $(web_dest)/ ; \
377− $(make_page) INSTALL > $(web_dest)/INSTALL.html; \
378+ cp INSTALL $(web_dest)/ ; \
378 sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \
379 sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \
379 sed -e 's/@OSX_DMG_NAME@/$(osx_dmg_name)/g' | \
380 sed -e 's/@OSX_DMG_NAME@/$(osx_dmg_name)/g' | \
380 sed -e 's/@WINDOWS_PKG_NAME@/$(win_pkg_name)/g' | \
381 sed -e 's/@WINDOWS_PKG_NAME@/$(win_pkg_name)/g' | \
381− sed -e 's/@VERSION@/$(VERSION)/g' | \
382+ sed -e 's/@VERSION@/$(VERSION)/g' > $(web_dest)/index.txt; \
382− $(make_page) > $(web_dest)/index.html; \
383− $(make_page) $(web_src)/features.txt > $(web_dest)/features.html; \
384− cp README $(web_dest)/ ; \
383+ cp $(web_src)/features.txt $(web_dest)/ ; \
385 ./$(MAIN) -s -w latex README > $(web_dest)/README.tex ; \
384 ./$(MAIN) -s -w latex README > $(web_dest)/README.tex ; \
386 cp $(web_src)/myheader.tex $(web_dest)/ ; \
385 cp $(web_src)/myheader.tex $(web_dest)/ ; \
387 cp $(web_src)/S5DEMO $(web_dest)/ ; \
386 cp $(web_src)/S5DEMO $(web_dest)/ ; \
388 cp $(web_src)/header.html $(web_dest)/ ; \
387 cp $(web_src)/header.html $(web_dest)/ ; \
389 cp $(web_src)/footer.html $(web_dest)/ ; \
388 cp $(web_src)/footer.html $(web_dest)/ ; \
390− sh $(web_src)/mkdemos.sh $(web_dest) $(shell pwd) | \
389+ cp $(web_src)/mkdemos.sh $(web_dest)/ ; \
391− $(make_page) > $(web_dest)/examples.html; \
390+ cp $(web_src)/Makefile $(web_dest)/ ; \
391+ PANDOC_PATH=$(shell pwd) make -C $(web_dest) ; \
392 ) || { rm -rf $(web_dest); exit 1; }
392 ) || { rm -rf $(web_dest); exit 1; }
393
393
394.PHONY: distclean clean
394.PHONY: distclean clean
web/Makefilenew file+20
@@ -0,0 +1,20 @@
1+all: index.html osx-notes.html README.html INSTALL.html features.html changelog.html examples.html
2+
3+PANDOC_PATH ?= $(dir $(shell which pandoc))
4+MAKEPAGE = $(PANDOC_PATH)/pandoc -s -S -B header.html -A footer.html -H css
5+PANDOC_DEPS = header.html footer.html css
6+
7+examples.txt : $(PANDOC_DEPS) mkdemos.sh
8+ ./mkdemos.sh . $$PANDOC_PATH > $@
9+
10+%.html : %.txt $(PANDOC_DEPS)
11+ $(MAKEPAGE) $< > $@
12+
13+%.html : % $(PANDOC_DEPS)
14+ $(MAKEPAGE) $< > $@
15+
16+changelog.html : changelog.txt $(PANDOC_DEPS)
17+ $(MAKEPAGE) -T "Pandoc changelog" $< > $@
18+
19+upload :
20+ sitecopy --update macfarlane
web/mkdemos.sh+1−1
@@ -1,7 +1,7 @@
1#!/bin/sh -e
1#!/bin/sh -e
2# creates example page for pandoc
2# creates example page for pandoc
3# argument #1 is the destination directory
3# argument #1 is the destination directory
4−# argument #2 is the directory containing pandoc, html2markdown, markdown2pdf
4+# argument #2 is pandoc path
5
5
6DEST=$1
6DEST=$1
7PROGPATH=$2
7PROGPATH=$2