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

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2010-08-31 12:15:30 +0200 (Tue, 31 Aug 2010)
New Revision: 1528

Modified:
   trunk/doc/ChangeLog
   trunk/doc/manual/Makefile.am
   trunk/doc/manual/gpg4win-compendium-de.tex
Log:
Changed html image path.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2010-08-31 06:47:03 UTC (rev 1527)
+++ trunk/doc/ChangeLog	2010-08-31 10:15:30 UTC (rev 1528)
@@ -2,6 +2,11 @@
 
 	* manual/Makefile.am: Adapt Makefile.am to added screenshots.
 
+	* manual/Makefile.am: Changed image path for compendium and
+	hyperlatex files.
+	* manual/gpg4win-compendium-de.tex: Added image-hyperlatex path
+	for hlxicons.
+
 2010-08-30 Drew Northup <dnorthup at maine.edu>
 
 	* manual/images-compendium/sc-gpgol-options_en.png,

Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am	2010-08-31 06:47:03 UTC (rev 1527)
+++ trunk/doc/manual/Makefile.am	2010-08-31 10:15:30 UTC (rev 1528)
@@ -269,9 +269,15 @@
 
 CLEANFILES = $(eps_compendium_files) $(eps_manual_files) \
              *.dvi *.pdf *.pdf *.toc *.log *.aux *.out *.idx *.ilg *.ind \
-	     	 *.html.d-stamp  *.html.d/*
+	     	 *.html *.html.d-stamp* *.html.d
 DISTCLEANFILES = version.tex
 
+clean: 
+	rm -rf $(CLEANFILES)
+
+distclean:
+	rm -rf $(CLEANFILES) $(DISTCLEANFILES)
+
 pkgdata_DATA = 	gpg4win-compendium-de.pdf \
 				gpg4win-compendium-en.pdf 
 
@@ -314,6 +320,8 @@
 dvi-de: gpg4win-compendium-de.dvi
 dvi-en: gpg4win-compendium-en.dvi
 
+html: 	 gpg4win-compendium-de.html.d-stamp \
+   		 gpg4win-compendium-en.html.d-stamp
 html-de: gpg4win-compendium-de.html.d-stamp
 html-en: gpg4win-compendium-en.html.d-stamp
 
@@ -333,12 +341,24 @@
             sed -n 's/.*\\IncludeImage{\([^}]*\).*/\1.png/p' $$src ;\
             sed -n 's/.*\\input{\([^}]*\).*/\1/p' $$src ) \
           | sort | uniq) ;\
-	 for f in $$files $(png_hyperlatex_files); do \
+	 for f in $$files; do \
 	   if [ -f "$$f" ]; then cp "$$f" $$wdir ;\
 	   elif [ -f "$(srcdir)/$$f" ]; then cp "$(srcdir)/$$f" $$wdir ;\
 	   fi ;\
-         done ;\
-         cd $$wdir ;\
+     done ;\
+	 mkdir $$wdir/images-hyperlatex;\
+	 for f in $(png_hyperlatex_files); do \
+	   if [ -f "$$f" ]; then cp "$$f" $$wdir/images-hyperlatex ;\
+	   elif [ -f "$(srcdir)/$$f" ]; then cp "$(srcdir)/$$f" $$wdir/images-hyperlatex ;\
+	   fi ;\
+     done ;\
+	 mkdir $$wdir/images-compendium;\
+	 for f in $(png_compendium_files); do \
+	   if [ -f "$$f" ]; then cp "$$f" $$wdir/images-compendium ;\
+	   elif [ -f "$(srcdir)/$$f" ]; then cp "$(srcdir)/$$f" $$wdir/images-compendium ;\
+	   fi ;\
+     done ;\
+     cd $$wdir ;\
 	 hyperlatex $$(basename $$src) ;\
 	 for f in $$files; do \
 	    x=$$(basename "$$f") ;\
@@ -346,7 +366,7 @@
 	 done
 	@mv -f $@.tmp $@
 
-online: gpg4win-compendium-de.html.d-stamp novices.html.d-stamp
+online: gpg4win-compendium-de.html.d-stamp gpg4win-compendium-en.html.d-stamp
 	set -e; \
 	echo "Going to put current manuals online for www.gpg4win.org ..."; \
         user=`svn info | sed -n '/^URL:/ s,.*svn+ssh://\\([^@]*\\).*,\\1,p'`;\
@@ -355,10 +375,10 @@
 	   echo "Cding to: $$x";\
            cd $$x ;\
            rsync -v * \
-             $${user}@wald.intevation.org:/gpg4win/htdocs/handbuecher/ ); \
+             $${user}@wald.intevation.org:/gpg4win/htdocs/doc/ ); \
 	done
 
-preview: gpg4win-compendium-de.html.d-stamp novices.html.d-stamp
+preview: gpg4win-compendium-de.html.d-stamp gpg4win-compendium-en.html.d-stamp
 	set -e; \
 	echo "Rsyncing the HTML manuals to the preview host ..."; \
 	for d in $^; do \

Modified: trunk/doc/manual/gpg4win-compendium-de.tex
===================================================================
--- trunk/doc/manual/gpg4win-compendium-de.tex	2010-08-31 06:47:03 UTC (rev 1527)
+++ trunk/doc/manual/gpg4win-compendium-de.tex	2010-08-31 10:15:30 UTC (rev 1528)
@@ -145,7 +145,7 @@
     % redefine bmod
     \newcommand{\bmod}{mod}
     % use hlx icons (default path)
-    \newcommand{\HlxIcons}{}
+    \newcommand{\HlxIcons}{./images-hyperlatex}
 
     % Footer
     \htmladdress{$\copyright$ \compendiumDateDE, v\compendiumVersionDE