Split version.sh to version.var; fix invocation in mkrelease

diff --git a/build/mkrelease b/build/mkrelease
index cf01220a4b42308272a3bc45c708ece0834f9743..06c7f67832b5cd0f4561ca0e24931ae0fe46aeaf 100755 (executable)
--- a/build/mkrelease
+++ b/build/mkrelease
@@ -47,7 +47,7 @@ if test ! -e $RELNAME/build/version.sh ; then
        exit 1
 fi
 
-. $RELNAME/build/version.sh
+eval `$RELNAME/build/version.sh`
 
 tar cf $RELNAME.tar $RELNAME
 gzip -9 -c $RELNAME.tar > $RELNAME.tgz

diff --git a/build/version.sh b/build/version.sh
index 2308efee2e30b0350e503091481dfff1e6e22a11..f2cf16fea07b2b02bfab5f0239cc84b23eaa110a 100755 (executable)
--- a/build/version.sh
+++ b/build/version.sh
@@ -4,13 +4,8 @@
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 #
-ol_package=OpenLDAP
-ol_major=2
-ol_minor=X
-ol_patch=X
-ol_api_inc=000000
-ol_api_lib=0:0:0
-ol_release_date="00/00/0000"
+DIR=`dirname $0`
+. $DIR/version.var
 
 if test $ol_patch != X ; then
        ol_version=${ol_major}.${ol_minor}.${ol_patch}

diff --git a/build/version.var b/build/version.var
new file mode 100644 (file)
index 0000000..f3fb643
--- /dev/null
+++ b/build/version.var
@@ -0,0 +1,13 @@
+#! /bin/sh
+# $OpenLDAP$
+## Copyright 2000-2003 The OpenLDAP Foundation
+## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+## of this package for details.
+#
+ol_package=OpenLDAP
+ol_major=2
+ol_minor=X
+ol_patch=X
+ol_api_inc=000000
+ol_api_lib=0:0:0
+ol_release_date="00/00/0000"