git.iko.soy/typeable/pandoc
on master help sign in
Separated $(web_dest) and website targets.
021f152fiddlosopher
Makefile+6−4
@@ -385,18 +385,19 @@ deb: debian
385
385
386.PHONY: website
386.PHONY: website
387web_src:=web
387web_src:=web
388−web_dest:=web/pandoc
388+web_dest:=pandoc-website
389make_page:=./$(MAIN) -s -S -B $(web_src)/header.html \
389make_page:=./$(MAIN) -s -S -B $(web_src)/header.html \
390 -A $(web_src)/footer.html \
390 -A $(web_src)/footer.html \
391 -H $(web_src)/css
391 -H $(web_src)/css
392cleanup_files+=$(web_dest)
392cleanup_files+=$(web_dest)
393−website: $(MAIN) html
393+$(web_dest) : html $(wildcard $(web_src)/*) $(osx_src)/Welcome changelog \
394+ INSTALL $(MANPAGES) $(MANDIR)/man1/pandoc.1.md README
394 -rm -rf $(web_dest)
395 -rm -rf $(web_dest)
395 ( \
396 ( \
396 mkdir $(web_dest); \
397 mkdir $(web_dest); \
397 cp -r html $(web_dest)/doc; \
398 cp -r html $(web_dest)/doc; \
398 cp $(web_src)/* $(web_dest)/; \
399 cp $(web_src)/* $(web_dest)/; \
399− sed -e 's#@VERSION@#$(VERSION)g' $(osx_src)/index.txt.in > \
400+ sed -e 's#@VERSION@#$(VERSION)#g' $(web_src)/index.txt.in > \
400 $(web_dest)/index.txt; \
401 $(web_dest)/index.txt; \
401 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > \
402 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > \
402 $(web_dest)/osx-notes.txt; \
403 $(web_dest)/osx-notes.txt; \
@@ -405,8 +406,9 @@ website: $(MAIN) html
405 cp INSTALL $(web_dest)/ ; \
406 cp INSTALL $(web_dest)/ ; \
406 cp $(MANDIR)/man1/pandoc.1.md $(web_dest)/ ; \
407 cp $(MANDIR)/man1/pandoc.1.md $(web_dest)/ ; \
407 cp $(MANDIR)/man1/*.1 $(web_dest)/ ; \
408 cp $(MANDIR)/man1/*.1 $(web_dest)/ ; \
408− PANDOC_PATH=$(shell pwd) make -C $(web_dest) ; \
409 ) || { rm -rf $(web_dest); exit 1; }
409 ) || { rm -rf $(web_dest); exit 1; }
410+website: $(MAIN) $(web_dest)
411+ PANDOC_PATH=$(shell pwd) make -C $(web_dest)
410
412
411.PHONY: distclean clean
413.PHONY: distclean clean
412distclean: clean
414distclean: clean
web/index.txt.in+1−1
@@ -104,7 +104,7 @@ You may view existing bug reports and submit new ones at
104
104
105# News
105# News
106
106
107−- Version @VERSION@ released (August 19, 2007).
107+- Version 0.41 released (August 19, 2007).
108
108
109 Fixes bugs in the handling of ordered lists and raw HTML.
109 Fixes bugs in the handling of ordered lists and raw HTML.
110 For details, see the changelog.
110 For details, see the changelog.