Index: openacs-4/packages/acs-core-docs/www/xml/Makefile =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/Makefile,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/acs-core-docs/www/xml/Makefile 14 May 2007 20:30:20 -0000 1.15 +++ openacs-4/packages/acs-core-docs/www/xml/Makefile 27 Oct 2014 16:39:30 -0000 1.16 @@ -29,6 +29,7 @@ if [ ! -d XSL -a ! -L XSL ]; then \ echo -e "\n\nNo XSL directory here. I am looking for one...\n"; \ for d in \ + /opt/local/share/xsl/docbook-xsl \ /sw/share/xml/docbook-xsl \ /usr/share/sgml/docbook/xsl-stylesheets-* \ /usr/share/sgml/docbook/xsl-stylesheets \ @@ -54,12 +55,11 @@ prelim: images cp images/*.{pdf,png,gif,jpg} ../images/ + # all non-regenerated html is kept in a sub-dir so that we can delete html + # in the main directory before regenerating + # this helps avoid meaningless cvs conflicts in second-hand files + rm -f ../*html -# all non-regenerated html is kept in a sub-dir so that we can delete html -# in the main directory before regenerating -# this helps avoid meaningless cvs conflicts in second-hand files - rm ../*html - target: non-xml # the dash u part of cp -u is redundant in the context of make/Makefile cp non-xml/*.html ..