Build fixes for gnupg2.
authorWerner Koch <wk@gnupg.org>
Fri, 15 Jun 2007 14:31:33 +0000 (14:31 +0000)
committerWerner Koch <wk@gnupg.org>
Fri, 15 Jun 2007 14:31:33 +0000 (14:31 +0000)
Please see README.

ChangeLog
README
autogen.sh
src/Makefile.am
src/gpg4win.mk.in

index dfc7917..47e1c96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-06-15  Werner Koch  <wk@g10code.com>
 
+       * src/gpg4win.mk.in: Add cruel hack to support gnupg2.
+
        * src/Makefile.am: Use --silent with most configure runs.
 
        * src/uninst-gnupg2.nsi, src/inst-libgnupg2.nsi: New.
diff --git a/README b/README
index 5436f43..cad2218 100644 (file)
--- a/README
+++ b/README
@@ -12,13 +12,10 @@ Instructions:
    [...]
    $ cd ..
 
-   If you have downloaded gnupg-2.x, you need to repack it so that the
-   name of the apckage is gnupg2. For example:
+   If you have downloaded gnupg-2.x, you need to rename that tarball.
+   e.g.:
    
-    tar xjf gnupg-2.0.5.tar.bz2 
-    mv gnupg-2.0.5 gnupg2-2.0.5
-    tar chf gnupg2-2.0.5.tar.bz2 gnupg2-2.0.5
-
+     mv gnupg-2.0.5.tar.bz2 gnupg2-2.0.5.tar.bz2
 
 2. Configure the source tree for cross compilation:
 
@@ -50,7 +47,7 @@ at least the following packages need to be installed:
  texinfo
  imagemagick
  tetex-bin
- tetex-extra
+ tr
  gs-common
  hyperlatex
 
index b5e7be7..44e60a0 100755 (executable)
@@ -37,7 +37,7 @@ ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
 
 DIE=no
 FORCE=
-if test "$1" = "--force"; then
+if test x"$1" = x"--force"; then
   FORCE=" --force"
   shift
 fi
index ee05c2f..eed2a5e 100644 (file)
@@ -83,7 +83,8 @@ gpg4win_pkg_gnupg2_configure = \
   --with-libassuan-prefix=$(idir) \
   --with-zlib=$(idir) \
   --with-pth-prefix=$(idir) \
-  --without-included-gettext
+  --without-included-gettext \
+  --disable-regex
 
 
 # Glib doesn't add the LDFLAGS automatically.
index 76f8216..3724da0 100644 (file)
@@ -80,6 +80,8 @@ endef
 # Support macro.  Unpack the archive $(1).
 define DEFLATE_macro
        case "$(1)" in                  \
+          */gnupg2-2.*.tar.bz2)          \
+            $(TAR) -xj --transform='s,^gnupg-,gnupg2-,' -f "$(1)" ;; \
          *.tar.gz | *.tgz)             \
            $(TAR) xzf "$(1)" ;;        \
          *.tar.bz2 | *.tbz2 | *.tbz)   \