Put all website commands into a subshell jail. If any command failed, we
would end up with web_dest directory which would have to be removed manually for further attempts. If this looked ugly; as an alternative solution we could change 'website' target as follows: website: $(web_dest)/index.html $(web_dest)/index.html: ... git-svn-id: https://pandoc.googlecode.com/svn/trunk@82 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
parent
cc14b53090
commit
6c87b87835
1 changed files with 14 additions and 12 deletions
26
Makefile
26
Makefile
|
@ -308,18 +308,20 @@ $(web_dest)/: $(MAIN) html $(tarball_name)
|
|||
exit 1; \
|
||||
}
|
||||
-rm -rf $(web_dest)
|
||||
mkdir $(web_dest)
|
||||
cp -r html $(web_dest)/doc
|
||||
cp $(osx_dmg_name) $(web_dest)/
|
||||
cp ../$(deb_main) $(web_dest)/
|
||||
cp $(tarball_name) $(web_dest)/
|
||||
cp $(web_src)/*.css $(web_dest)/
|
||||
$(make_page) README > $(web_dest)/README.html
|
||||
$(make_page) INSTALL > $(web_dest)/INSTALL.html
|
||||
$(make_page) changelog > $(web_dest)/history.html
|
||||
sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \
|
||||
sed -e 's/@DEB_NAME@/$(deb_main)/g' | \
|
||||
$(make_page) > $(web_dest)/index.html
|
||||
( \
|
||||
mkdir $(web_dest); \
|
||||
cp -r html $(web_dest)/doc; \
|
||||
cp $(osx_dmg_name) $(web_dest)/; \
|
||||
cp ../$(deb_main) $(web_dest)/; \
|
||||
cp $(tarball_name) $(web_dest)/; \
|
||||
cp $(web_src)/*.css $(web_dest)/; \
|
||||
$(make_page) README > $(web_dest)/README.html; \
|
||||
$(make_page) INSTALL > $(web_dest)/INSTALL.html; \
|
||||
$(make_page) changelog > $(web_dest)/history.html; \
|
||||
sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \
|
||||
sed -e 's/@DEB_NAME@/$(deb_main)/g' | \
|
||||
$(make_page) > $(web_dest)/index.html; \
|
||||
) || { rm -rf $(web_dest); exit 1; }
|
||||
|
||||
.PHONY: distclean clean
|
||||
distclean: clean
|
||||
|
|
Loading…
Reference in a new issue