g10: Drop unused argument.
[gnupg.git] / autogen.sh
index 112d2ee..10cc203 100755 (executable)
@@ -202,19 +202,19 @@ if [ "$myhost" = "find-version" ]; then
 
     case "$version_parts" in
       2)
-        matchstr1="$package-$major.[0-9][0-9]*"
+        matchstr1="$package-$major.[0-9]*"
         matchstr2="$package-$major-base"
         vers="$major.$minor"
         ;;
       *)
-        matchstr1="$package-$major.$minor.[0-9][0-9]*"
+        matchstr1="$package-$major.$minor.[0-9]*"
         matchstr2="$package-$major.$minor-base"
         vers="$major.$minor.$micro"
         ;;
     esac
 
     beta=no
-    if [ -d .git ]; then
+    if [ -e .git ]; then
       ingit=yes
       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
       if [ -n "$tmp" ]; then
@@ -311,6 +311,7 @@ if [ "$myhost" = "w32" ]; then
     $tsdir/configure --enable-maintainer-mode ${SILENT} \
              --prefix=${w32root}  \
              --host=${host} --build=${build} SYSROOT=${w32root} \
+             PKG_CONFIG_LIBDIR=${w32root} \
              ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc
@@ -422,7 +423,7 @@ if [ -d .git ]; then
     [ -z "${SILENT}" ] && cat <<EOF
 *** Activating trailing whitespace git pre-commit hook. ***
     For more information see this thread:
-      http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
+      http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084.html
     To deactivate this pre-commit hook again move .git/hooks/pre-commit
     and .git/hooks/pre-commit.sample out of the way.
 EOF