[Gpg4win-commits] r901 - in trunk: . doc doc/manual
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Sep 4 09:43:47 CEST 2008
Author: werner
Date: 2008-09-04 09:43:47 +0200 (Thu, 04 Sep 2008)
New Revision: 901
Modified:
trunk/configure.ac
trunk/doc/ChangeLog
trunk/doc/manual/Makefile.am
Log:
images are now all included in the manual.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-09-03 17:47:23 UTC (rev 900)
+++ trunk/configure.ac 2008-09-04 07:43:47 UTC (rev 901)
@@ -25,8 +25,8 @@
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
# Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.9.6-beta])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.9.7])
+m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2008-09-03 17:47:23 UTC (rev 900)
+++ trunk/doc/ChangeLog 2008-09-04 07:43:47 UTC (rev 901)
@@ -1,3 +1,7 @@
+2008-09-04 Werner Koch <wk at g10code.com>
+
+ * manual/Makefile.am (%.html.d-stamp): New to replace %.html.d.
+
2008-09-03 Werner Koch <wk at g10code.com>
* manual/Makefile.am (pkgdata_DATA): Remove einsteiger.pdf and
Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am 2008-09-03 17:47:23 UTC (rev 900)
+++ trunk/doc/manual/Makefile.am 2008-09-04 07:43:47 UTC (rev 901)
@@ -136,6 +136,7 @@
CLEANFILES = $(eps_files_bb) $(png_files_eps) \
*.dvi *.pdf *.pdf *.toc *.log *.aux *.out \
+ gpg4win-compendium-de.html.d-stamp \
gpg4win-compendium-de.html.d/*
DISTCLEANFILES = version.tex $(eps_files_png)
@@ -145,7 +146,7 @@
BUILT_SOURCES = $(eps_files_bb) $(png_files_eps) $(eps_files_png)
all-local: gpg4win-compendium-de.pdf novices.pdf \
- gpg4win-compendium-de.html.d
+ gpg4win-compendium-de.html.d-stamp
# advanced.pdf
@@ -217,13 +218,15 @@
%.html.d-stamp : %.html
@rm -f $@.tmp
@touch $@.tmp
- -rm -rf $@
- mkdir $@
- (src=$$(echo $@ | sed 's/.html.d$$/.tex/'); \
- echo $@ | sed 's/.d$$//'; \
+ set -e; \
+ src=$$(echo $@ | sed 's/.html.d-stamp$$/.tex/'); \
+ srcd=$$(echo $$src | sed 's/.tex$$/.html.d/'); \
+ rm -rf $$srcd || true;\
+ mkdir $$srcd;\
+ (echo $$src | sed 's/.tex$$/.html/'; \
LC_CTYPE=C sed -n 's/.*\\xname{\([^}]*\).*/\1.html/p' $$src;\
- LC_CTYPE=C sed -n 's/.*\\IncludeImage\[.*\]){\([^}]*\).*/\1.png/p' \
+ LC_CTYPE=C sed -n 's/.*\\IncludeImage\[.*\]{\([^}]*\).*/\1.png/p' \
$$src;\
LC_CTYPE=C sed -n 's/.*\\IncludeImage{\([^}]*\).*/\1.png/p' $$src \
- ) | sort | uniq | xargs $(INSTALL_DATA) -t $@
+ ) | sort | uniq | xargs $(INSTALL_DATA) -t $$srcd
@mv -f $@.tmp $@
More information about the Gpg4win-commits
mailing list