aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2002-06-30 07:39:53 +0000
committerWerner Koch <[email protected]>2002-06-30 07:39:53 +0000
commita7489d670a0e74cb25a9a2bec8d54a63a2d9dff2 (patch)
tree2236c65e292e007b6e0e88a7e9a2f950ebc8d27e
parentmsgmerge'd. (diff)
downloadgnupg-a7489d670a0e74cb25a9a2bec8d54a63a2d9dff2.tar.gz
gnupg-a7489d670a0e74cb25a9a2bec8d54a63a2d9dff2.zip
* mk-w32-dist (bindir): Fixes vor VPATH builds in a subdir,
include gpgv.
Diffstat (limited to '')
-rw-r--r--scripts/ChangeLog5
-rwxr-xr-xscripts/mk-w32-dist22
2 files changed, 19 insertions, 8 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 4447ea143..b0b74f8bf 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-30 Werner Koch <[email protected]>
+
+ * mk-w32-dist (bindir): Fixes vor VPATH builds in a subdir,
+ include gpgv.
+
2002-06-21 Stefan Bellon <[email protected]>
* conf-riscos/Makefile: Changes due to moving around RISC OS
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 317caef6e..a6626d064 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -15,8 +15,13 @@ set -e
cd dist-w32
+bindir=..
+
if [ -f ../README ]; then
srcdir=..
+elif [ -f ../../README ]; then
+ srcdir=../..
+ bindir=..
elif [ -f ../../gnupg-stable/README ]; then
srcdir=../../gnupg-stable
elif [ -f ../../../gnupg-stable/README ]; then
@@ -26,13 +31,18 @@ else
exit 1
fi
+version=$(sed -n 's/^#[ ]*define[ ][ ]*VERSION[ ][ ]*\"\([0-9.]*\)\"/\1/p' $bindir/config.h)
+echo "building version $version"
+
rm * || true
-ln ../g10/gpg gpg.exe
+ln ${bindir}/g10/gpg.exe gpg.exe
+ln ${bindir}/g10/gpgv.exe gpgv.exe
mingw32 strip gpg.exe
-if [ -f ../doc/gpg.man ] ; then
+mingw32 strip gpgv.exe
+if [ -f ${srcdir}/doc/gpg.man ] ; then
sed `printf "s/\b.//g"` ../doc/gpg.man >gpg.man
else
- man -Tlatin1 -l ../doc/gpg.1 | sed `printf "s/\b.//g"` >gpg.man
+ man -Tlatin1 -l ${srcdir}/doc/gpg.1 | sed `printf "s/\b.//g"` >gpg.man
fi
todos gpg.man
cp ${srcdir}/README .
@@ -44,10 +54,6 @@ todos README.W32
ln ${srcdir}/doc/FAQ .
todos FAQ
for i in ${srcdir}/po/*.gmo; do ln $i "$(basename $i .gmo).mo" ; done
-zip "gnupg-w32-$(cat ${srcdir}/VERSION).zip" *
-
-
-
-
+zip "gnupg-w32-${version}.zip" *