aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-08-25 18:39:06 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-08-25 18:39:06 +0000
commit021f15228931e72b3466561ad2e718b1ec302da1 (patch)
tree5ad6bbe5905b815ea4601abd4437ac48aff3362b /Makefile
parentf609755cb6eed6e0f42f90f1c6814f7578b2000a (diff)
downloadpandoc-021f15228931e72b3466561ad2e718b1ec302da1.tar.gz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index aab6df821..bfada9268 100644
--- a/Makefile
+++ b/Makefile
@@ -385,18 +385,19 @@ deb: debian
.PHONY: website
web_src:=web
-web_dest:=web/pandoc
+web_dest:=pandoc-website
make_page:=./$(MAIN) -s -S -B $(web_src)/header.html \
-A $(web_src)/footer.html \
-H $(web_src)/css
cleanup_files+=$(web_dest)
-website: $(MAIN) html
+$(web_dest) : html $(wildcard $(web_src)/*) $(osx_src)/Welcome changelog \
+ INSTALL $(MANPAGES) $(MANDIR)/man1/pandoc.1.md README
-rm -rf $(web_dest)
( \
mkdir $(web_dest); \
cp -r html $(web_dest)/doc; \
cp $(web_src)/* $(web_dest)/; \
- sed -e 's#@VERSION@#$(VERSION)g' $(osx_src)/index.txt.in > \
+ sed -e 's#@VERSION@#$(VERSION)#g' $(web_src)/index.txt.in > \
$(web_dest)/index.txt; \
sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > \
$(web_dest)/osx-notes.txt; \
@@ -405,8 +406,9 @@ website: $(MAIN) html
cp INSTALL $(web_dest)/ ; \
cp $(MANDIR)/man1/pandoc.1.md $(web_dest)/ ; \
cp $(MANDIR)/man1/*.1 $(web_dest)/ ; \
- PANDOC_PATH=$(shell pwd) make -C $(web_dest) ; \
) || { rm -rf $(web_dest); exit 1; }
+website: $(MAIN) $(web_dest)
+ PANDOC_PATH=$(shell pwd) make -C $(web_dest)
.PHONY: distclean clean
distclean: clean