[Gpg4win-commits] r623 - in trunk/doc: . manual

[scm-commit@wald.intevation.org]

Author: jan
Date: 2007-12-05 16:39:58 +0100 (Wed, 05 Dec 2007)
New Revision: 623

Modified:
   trunk/doc/ChangeLog
   trunk/doc/manual/Makefile.am
Log:
* manuals/Makefile.am: replaced target webversion by target
htmlversion which creates a separate directory "html" and
copies anything relevant there.
This simplifies and removes redundancy for targets online
and preview.



Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2007-12-05 14:39:25 UTC (rev 622)
+++ trunk/doc/ChangeLog	2007-12-05 15:39:58 UTC (rev 623)
@@ -1,5 +1,13 @@
 2007-12-05  Jan-Oliver Wagner  <jan-oliver.wagner at intevation.de>
 
+	* manuals/Makefile.am: replaced target webversion by target
+	htmlversion which creates a separate directory "html" and
+	copies anything relevant there.
+	This simplifies and removes redundancy for targets online
+	and preview.
+
+2007-12-05  Jan-Oliver Wagner  <jan-oliver.wagner at intevation.de>
+
 	* CD/README-DE.html: New. Overview HTML page for the contents
 	of the Gpg4win CD.
 

Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am	2007-12-05 14:39:25 UTC (rev 622)
+++ trunk/doc/manual/Makefile.am	2007-12-05 15:39:58 UTC (rev 623)
@@ -105,29 +105,25 @@
 #advanced.dvi : version.tex macros-en.tex $(eps_files_bb)
 #advanced.html : version.tex macros-en.tex $(eps_files_png)
 
-webversion: einsteiger.html durchblicker.html novices.html 
+htmlversion: einsteiger.html durchblicker.html novices.html
 # advanced.html
+	rm -rf html
+	mkdir html
+	cp einsteiger*.html durchblicker*.html novices*.html html/
+	cp $(web_png_files) $(png_files) $(eps_files_png) gpg4win-logo.png html/
 
-online: webversion
+online: htmlversion
 	set -e; \
 	echo "Going to put current manuals online for www.gpg4win.org ..."; \
         user=`svn info | sed -n '/^URL:/ s,.*svn+ssh://\\([^@]*\\).*,\\1,p'`;\
-	rsync -v --exclude='.svn' einsteiger*.html durchblicker*.html \
-          novices*.html \
-	  einsteiger.css durchblicker.css \
-	  $(web_png_files) $(png_files) $(eps_files_png) gpg4win-logo.png \
-	  $${user}@wald.intevation.org:/gpg4win/htdocs/handbuecher/
+	( cd html ; rsync -v * \
+	  $${user}@wald.intevation.org:/gpg4win/htdocs/handbuecher/ )
 
-preview: webversion
+preview: htmlversion
 	set -e; \
 	echo "Rsyncing the HTML manuals to the preview host ..."; \
-	rsync -v --exclude='.svn' einsteiger*.html durchblicker*.html \
-          novices*.html \
-	  einsteiger.css durchblicker.css \
-	  $(web_png_files) $(png_files) $(eps_files_png) gpg4win-logo.png \
-	  ${PREVIEWHOST}/
+	( cd html ; rsync -v * ${PREVIEWHOST}/ )
 
-
 %.eps.bb : %.eps.gz
 	$(ZCAT) `test -f '$<' || echo '$(srcdir)/'`$< \
           | grep '^%%BoundingBox' | head -1 > $@