Building installers does now work. However make distcheck fails with
authorWerner Koch <wk@gnupg.org>
Mon, 4 Dec 2006 19:01:45 +0000 (19:01 +0000)
committerWerner Koch <wk@gnupg.org>
Mon, 4 Dec 2006 19:01:45 +0000 (19:01 +0000)
  make[2]: *** No rule to make target inst-man_advanced_en.nsi', needed by
        gpg4win-1.0.8-svn361.exe'.  Stop.
Need to look at it tomorrow.

ChangeLog
Makefile.am
autogen.sh
doc/ChangeLog
src/Makefile.am
src/inst-man_advanced_de.nsi

index 305a5ad..d373ace 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-04  Werner Koch  <wk@g10code.com>
+
+       * src/Makefile.am (gpg4win_ipkgs): Add english manuals.
+
+       * autogen.sh <--build-w32>: Disable the english manuals for now.
+
 2006-11-30  Werner Koch  <wk@g10code.com>
 
        * include/config.nsi.in: Add definitions for the english manuals.
index 95bbd51..caa4abd 100644 (file)
@@ -19,7 +19,9 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
-DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc
+DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc \
+                            --disable-pkg-man_novice_en \
+                            --disable-pkg-man_advanced_en
 
 SUBDIRS = packages include doc src
 
index 5174237..c4d984e 100755 (executable)
@@ -76,7 +76,9 @@ if test "$1" = "--build-w32"; then
         fi
     fi
 
-    ./configure --host=${host} --build=${build}  "$@"
+    ./configure --host=${host} --build=${build} \
+                --disable-pkg-man_novice_en     \
+                --disable-pkg-man_advanced_en  "$@"
     rc=$?
 
     exit $rc
index e3cda24..e7fe174 100644 (file)
@@ -1,3 +1,7 @@
+2006-12-04  Brigitte Hamilton <gordianknits@gmail.com>  (wk)
+
+       * manual/what-is-gpg4win.tex: Did translation.
+
 2006-11-30  Brigitte Hamilton <gordianknits@gmail.com>  (wk)
 
        * manual/novices.tex: Filled with content.
index 865d1b6..cf1082b 100644 (file)
@@ -177,7 +177,7 @@ endef
 # Supported internal packages.  Internal packages do not require any
 # special support.  Thus, this variable is actually unused, and no
 # rules are added in gpg4win.mk.
-gpg4win_ipkgs := man_novice_de man_advanced_de
+gpg4win_ipkgs := man_novice_de man_advanced_de man_novice_en man_advanced_en
 
 
 # Now do the bunch of the work.  This is a bunch of dirty magic to
index 4f73ec5..81ef9f1 100644 (file)
@@ -31,7 +31,7 @@ Section "$(DESC_Name_man_advanced_de)" SEC_man_advanced_de
 !else
 
   SetOutPath "$INSTDIR\share\gpg4win"
-  File "${BUILD_DIR}/../doc/manual-de/durchblicker.pdf"
+  File "${BUILD_DIR}/../doc/manual/durchblicker.pdf"
 !endif
 SectionEnd