* manuals/Makefile.am: replaced target webversion by target
authorJan-Oliver Wagner <jan@intevation.de>
Wed, 5 Dec 2007 15:39:58 +0000 (15:39 +0000)
committerJan-Oliver Wagner <jan@intevation.de>
Wed, 5 Dec 2007 15:39:58 +0000 (15:39 +0000)
htmlversion which creates a separate directory "html" and
copies anything relevant there.
This simplifies and removes redundancy for targets online
and preview.

doc/ChangeLog
doc/manual/Makefile.am

index 6ee8a6a..243763b 100644 (file)
@@ -1,5 +1,13 @@
 2007-12-05  Jan-Oliver Wagner  <jan-oliver.wagner@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@intevation.de>
+
        * CD/README-DE.html: New. Overview HTML page for the contents
        of the Gpg4win CD.
 
index 6ed8fa7..936b905 100644 (file)
@@ -105,28 +105,24 @@ novices.html : version.tex macros-en.tex $(eps_files_png)
 #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)/'`$< \