git.iko.soy/typeable/pandoc
on master help sign in
Separated $(web_dest) and website targets.

Fixed a bug in index.txt.in. git-svn-id: https://pandoc.googlecode.com/svn/trunk@898 788f1e2b-df1e-0410-8736-df70ead52e1b

commit021f15228931e72b3466561ad2e718b1ec302da1 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSat 25 Aug 2007, 18:39 (19 years ago) parentf609755
2 files changed+7−5
Makefile+6−4 web/index.txt.in+1−1
Makefile+6−4
@@ -385,18 +385,19 @@ deb: debian
385385
386386.PHONY: website
387387web_src:=web
388−web_dest:=web/pandoc
388+web_dest:=pandoc-website
389389make_page:=./$(MAIN) -s -S -B $(web_src)/header.html \
390390 -A $(web_src)/footer.html \
391391 -H $(web_src)/css
392392cleanup_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
394395 -rm -rf $(web_dest)
395396 ( \
396397 mkdir $(web_dest); \
397398 cp -r html $(web_dest)/doc; \
398399 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 > \
400401 $(web_dest)/index.txt; \
401402 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > \
402403 $(web_dest)/osx-notes.txt; \
@@ -405,8 +406,9 @@ website: $(MAIN) html
405406 cp INSTALL $(web_dest)/ ; \
406407 cp $(MANDIR)/man1/pandoc.1.md $(web_dest)/ ; \
407408 cp $(MANDIR)/man1/*.1 $(web_dest)/ ; \
408− PANDOC_PATH=$(shell pwd) make -C $(web_dest) ; \
409409 ) || { rm -rf $(web_dest); exit 1; }
410+website: $(MAIN) $(web_dest)
411+ PANDOC_PATH=$(shell pwd) make -C $(web_dest)
410412
411413.PHONY: distclean clean
412414distclean: clean
web/index.txt.in+1−1
@@ -104,7 +104,7 @@ You may view existing bug reports and submit new ones at
104104
105105# News
106106
107−- Version @VERSION@ released (August 19, 2007).
107+- Version 0.41 released (August 19, 2007).
108108
109109 Fixes bugs in the handling of ordered lists and raw HTML.
110110 For details, see the changelog.