# HG changeset patch
# User Dongsheng Song <dongsheng.song@gmail.com>
# Date 1236865688 -28800
# Node ID c88aa4edf9df8984f92407951b89a0c96e4f1a0f
# Parent  f7d674e6e7367aa9f47119b43aab433fb507db7e
Follow up 586:0e3d8f66bbb7 and 587:bae6d1503482, adjust Makefile and .hgignore

diff -r f7d674e6e736 -r c88aa4edf9df .hgignore
--- a/.hgignore	Thu Mar 12 17:43:30 2009 +0800
+++ b/.hgignore	Thu Mar 12 21:48:08 2009 +0800
@@ -1,5 +1,6 @@
-^htdocs/
-^tools/fop/
+[^/]+/build/
+[^/]+/fop/
+[^/]+/html/
 
 syntax: glob
 
@@ -18,4 +19,4 @@
 .validated-00book.xml
 web/hgbook/.database.sqlite3
 web/hgbook/secrets.py
-xsl/system-xsl
+stylesheets/system-xsl
diff -r f7d674e6e736 -r c88aa4edf9df en/Makefile
--- a/en/Makefile	Thu Mar 12 17:43:30 2009 +0800
+++ b/en/Makefile	Thu Mar 12 21:48:08 2009 +0800
@@ -126,21 +126,21 @@
 
 all: web
 
-../xsl/system-xsl: $(system-xsl-dir)
+../stylesheets/system-xsl: $(system-xsl-dir)
 	ln -s $< $@
 
 web: websup html
 
-html: ../xsl/system-xsl $(xml-src-files) valid
-	xsltproc $(xsltproc-opts) -o html/read/x ../xsl/chunk-stylesheet.xsl 00book.xml
+html: ../stylesheets/system-xsl $(xml-src-files) valid
+	xsltproc $(xsltproc-opts) -o html/read/x ../stylesheets/chunk-stylesheet.xsl 00book.xml
 	for i in html/read/*.html; do \
 	  gzip -9 -c $$i > $$i.gz; \
 	done
 
 websup: $(extras-web)
-	mkdir -p $(obj-websup)/figs
-	cp ../xsl/system-xsl/images/*.png $(obj-websup)/figs
-	cp -f ../web/icons/*.png $(obj-websup)/figs
+	mkdir -p $(obj-websup)/images
+	cp ../stylesheets/system-xsl/images/*.png $(obj-websup)/images
+	cp -f ../web/icons/*.png $(obj-websup)/images
 
 web: websup