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 -r1.10 -r1.11
--- openacs-4/packages/acs-core-docs/www/xml/Makefile	26 Jan 2004 15:39:44 -0000	1.10
+++ openacs-4/packages/acs-core-docs/www/xml/Makefile	4 Feb 2004 12:12:16 -0000	1.11
@@ -54,10 +54,11 @@
 prelim:
 	cp images/*.{pdf,png,gif,jpg} ../images/
 
-# put all non-regenerated html in a sub-dir so that we can delete html
-# in the main directory and regenerate
-	cp non-xml/*.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
+	cp -u non-xml/*.html ../
 	cp openacs.css ..
 
 html: prelim XSL