[Gpg4win-commits] r365 - in trunk: . doc src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2006-12-04 20:01:45 +0100 (Mon, 04 Dec 2006)
New Revision: 365

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/doc/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-man_advanced_de.nsi
Log:
Building installers does now work.  However make distcheck fails with
  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. 


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-12-04 16:57:28 UTC (rev 364)
+++ trunk/ChangeLog	2006-12-04 19:01:45 UTC (rev 365)
@@ -1,3 +1,9 @@
+2006-12-04  Werner Koch  <wk at 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 at g10code.com>
 
 	* include/config.nsi.in: Add definitions for the english manuals.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-12-04 16:57:28 UTC (rev 364)
+++ trunk/Makefile.am	2006-12-04 19:01:45 UTC (rev 365)
@@ -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
 

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2006-12-04 16:57:28 UTC (rev 364)
+++ trunk/autogen.sh	2006-12-04 19:01:45 UTC (rev 365)
@@ -76,7 +76,9 @@
         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

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2006-12-04 16:57:28 UTC (rev 364)
+++ trunk/doc/ChangeLog	2006-12-04 19:01:45 UTC (rev 365)
@@ -1,3 +1,7 @@
+2006-12-04  Brigitte Hamilton <gordianknits at gmail.com>  (wk)
+
+	* manual/what-is-gpg4win.tex: Did translation.
+
 2006-11-30  Brigitte Hamilton <gordianknits at gmail.com>  (wk)
 
 	* manual/novices.tex: Filled with content.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2006-12-04 16:57:28 UTC (rev 364)
+++ trunk/src/Makefile.am	2006-12-04 19:01:45 UTC (rev 365)
@@ -177,7 +177,7 @@
 # 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

Modified: trunk/src/inst-man_advanced_de.nsi
===================================================================
--- trunk/src/inst-man_advanced_de.nsi	2006-12-04 16:57:28 UTC (rev 364)
+++ trunk/src/inst-man_advanced_de.nsi	2006-12-04 19:01:45 UTC (rev 365)
@@ -31,7 +31,7 @@
 !else
 
   SetOutPath "$INSTDIR\share\gpg4win"
-  File "${BUILD_DIR}/../doc/manual-de/durchblicker.pdf"
+  File "${BUILD_DIR}/../doc/manual/durchblicker.pdf"
 !endif
 SectionEnd