Remove automake autoconf vars

Commit 4706854f (autoconf: updates and cleanup) removed our invocation
of AM_INIT_AUTOMAKE, which defines the output variables PACKAGE and
VERSION. Several files in our build system are still referencing
@PACKAGE@ and @VERSION@, though, leaving them un-substituted. This
most easily is seen as the AFSVersion version string remaining as
"@VERSION@" when the tree is built without git, but it also affects
some packaging in the tree.

Remove references to @VERSION@ and @PACKAGE@, replacing them with
their autoconf equivalents @PACKAGE_VERSION@ and @PACKAGE_TARNAME@.

Reviewed-on: https://gerrit.openafs.org/13357
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 2f2c2ce62aa17ecac3651d64c1168af926f7458b)

Change-Id: If2b98b8930bc687170f53f852417fb9374bf6c60
Reviewed-on: https://gerrit.openafs.org/13789
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/config/Makefile.version-CML.in b/src/config/Makefile.version-CML.in
index 45c4b8491be14e9eba81e656d9bd23601de36a54..0a08a92092ca92858827d4ff59cf420aea7c72b3 100644 (file)
--- a/src/config/Makefile.version-CML.in
+++ b/src/config/Makefile.version-CML.in
@@ -5,8 +5,8 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-PACKAGE=@PACKAGE@
-VERSION=@VERSION@
+PACKAGE=@PACKAGE_TARNAME@
+VERSION=@PACKAGE_VERSION@
 
 AFS_component_version_number.o: AFS_component_version_number.c $(TOP_SRCDIR)/config/mkvers
 version.xml version.txt: $(TOP_SRCDIR)/config/mkvers

diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in
index c65cfe915acc1f713a07cc47e30bf17c59374b3a..8a11ee89878290d4639d9009ba38970498963431 100644 (file)
--- a/src/config/Makefile.version-NOCML.in
+++ b/src/config/Makefile.version-NOCML.in
@@ -5,12 +5,12 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-PACKAGE=@PACKAGE@
+PACKAGE=@PACKAGE_TARNAME@
 
 AFS_component_version_number.o: AFS_component_version_number.c
 
 AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version
-       ( VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \
+       ( VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@PACKAGE_VERSION@"` && \
        if [ "$$SOURCE_DATE_EPOCH" ]; then \
             echo 'char cml_version_number[]="@(#)OpenAFS '$$VERSION `date -u -d "@$$SOURCE_DATE_EPOCH" +"%Y-%m-%d" 2>/dev/null || date -u -r "$$SOURCE_DATE_EPOCH" +"%Y-%m-%d"`'";'; \
        else \
@@ -22,7 +22,7 @@ AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version
        rm -f AFS_component_version_number.c.NEW
 
 version.xml:
-       VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \
+       VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@PACKAGE_VERSION@"` && \
        echo '<?xml version="1.0" encoding="UTF-8"?>' >version.xml && \
        echo '<revision>' >>version.xml && \
        echo '<revnumber>'$$VERSION'</revnumber>' >>version.xml && \

diff --git a/src/packaging/MacOS/OpenAFS-debug.Description.plist.in b/src/packaging/MacOS/OpenAFS-debug.Description.plist.in
index 2667452f09f451c507492bd7bb238eae17eb1784..dfbb4dc3030400cdc42cd30e3c69089caa452eb3 100644 (file)
--- a/src/packaging/MacOS/OpenAFS-debug.Description.plist.in
+++ b/src/packaging/MacOS/OpenAFS-debug.Description.plist.in
@@ -9,6 +9,6 @@
        <key>IFPkgDescriptionTitle</key>
        <string>OpenAFS debug extension</string>
        <key>IFPkgDescriptionVersion</key>
-       <string>@VERSION@</string>
+       <string>@PACKAGE_VERSION@</string>
 </dict>
 </plist>

diff --git a/src/packaging/MacOS/OpenAFS.Description.plist.in b/src/packaging/MacOS/OpenAFS.Description.plist.in
index 8dece17c269e927105b423ddb33bca50f3462779..3cab1f7e3034231ed0e649b267fb9e179efda165 100644 (file)
--- a/src/packaging/MacOS/OpenAFS.Description.plist.in
+++ b/src/packaging/MacOS/OpenAFS.Description.plist.in
@@ -9,6 +9,6 @@
        <key>IFPkgDescriptionTitle</key>
        <string>OpenAFS</string>
        <key>IFPkgDescriptionVersion</key>
-       <string>@VERSION@</string>
+       <string>@PACKAGE_VERSION@</string>
 </dict>
 </plist>

diff --git a/src/packaging/MacOS/OpenAFS.info.in b/src/packaging/MacOS/OpenAFS.info.in
index a3d04a5bc2a1d186ef6e8fa539b8dc68c3fc839b..ac40126af50577295f6d45b1122553e5cef1a22a 100644 (file)
--- a/src/packaging/MacOS/OpenAFS.info.in
+++ b/src/packaging/MacOS/OpenAFS.info.in
@@ -1,5 +1,5 @@
 Title OpenAFS
-Version @VERSION@
+Version @PACKAGE_VERSION@
 Description The OpenAFS distributed filesystem. This package installs a ready-to-run client for OpenAFS. See http://www.openafs.org for more information.
 DefaultLocation /
 Diskname (null)

diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in
index 143bda77701eb4ef51088d8f85fc79b10426181b..ec3711cffd4b47af2faa44b9772819e5ec1e5f15 100644 (file)
--- a/src/packaging/MacOS/buildpkg.sh.in
+++ b/src/packaging/MacOS/buildpkg.sh.in
@@ -306,14 +306,14 @@ if [ $secondpass = yes ]; then
     if [ $majorvers -ge 8 ]; then
        mv $CURDIR/OpenAFS-debug-extension.pkg $CURDIR/dmg
     fi
-    rm -rf $CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg
+    rm -rf $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg
     cp $RESSRC/Uninstall $CURDIR/dmg/Uninstall.command
     cp $RESSRC/DS_Store $CURDIR/dmg/.DS_Store
     mkdir $CURDIR/dmg/.background
     cp $RESSRC/afslogo.jpg $CURDIR/dmg/.background
 #    hdiutil create -srcfolder $CURDIR/dmg -volname OpenAFS -anyowners $CURDIR/OpenAFS.dmg
     hdiutil makehybrid -hfs -hfs-volume-name OpenAFS -hfs-openfolder $CURDIR/dmg $CURDIR/dmg -o $CURDIR/TMP.dmg
-    hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg
+    hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg
     rm $CURDIR/TMP.dmg
     rm -rf $CURDIR/dmg
     # Unfortunately, sudo sets $USER to root, so I can't chown the 

diff --git a/src/packaging/MacOS/pkgbuild.sh.in b/src/packaging/MacOS/pkgbuild.sh.in
index 3570d7aad7b8732d144f07cf84e3516490557478..d65f585bc15f8bb5e8cfb86f88641010cda3eae5 100644 (file)
--- a/src/packaging/MacOS/pkgbuild.sh.in
+++ b/src/packaging/MacOS/pkgbuild.sh.in
@@ -426,7 +426,7 @@ if [ x"$PASS2" = x1 ]; then
 
     rm -rf "$CURDIR"/OpenAFS-debug-extension.pkg
     /usr/bin/pkgbuild --root "$DPKGROOT" --id org.openafs.OpenAFS-debug.pkg \
-                     --version '@VERSION@' \
+                     --version '@PACKAGE_VERSION@' \
             "$CURDIR"/OpenAFS-debug-extension.pkg
 
     cd "$RESSRC"
@@ -445,7 +445,7 @@ if [ x"$PASS2" = x1 ]; then
 
     rm -rf "$CURDIR"/OpenAFS-dist.pkg
     /usr/bin/pkgbuild --root "$PKGROOT" --id org.openafs.OpenAFS.pkg \
-                     --version '@VERSION@' \
+                     --version '@PACKAGE_VERSION@' \
                      --scripts "$PKGRES" "$CURDIR"/OpenAFS-dist.pkg
 
     rm -rf "$PKGRES"
@@ -466,7 +466,7 @@ if [ x"$PASS2" = x1 ]; then
     sed -e "s/%%OSX_MAJOR_CUR%%/$THISREL/g" \
        -e "s/%%OSX_MAJOR_NEXT%%/$(( $THISREL + 1 ))/g" \
        -e "s,%%PRES_EXTRA%%,$PRES_EXTRA,g" \
-       -e "s/%%OPENAFS_VERSION%%/@VERSION@/g" \
+       -e "s/%%OPENAFS_VERSION%%/@PACKAGE_VERSION@/g" \
        < Distribution.xml.in > Distribution.xml
 
     rm -rf "$CURDIR/prod"
@@ -484,7 +484,7 @@ if [ x"$PASS2" = x1 ]; then
 
     rm -rf "$CURDIR/dmg"
     rm -f "$CURDIR/TMP.dmg"
-    rm -rf "$CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg"
+    rm -rf "$CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME.dmg"
 
     mkdir "$CURDIR"/dmg
     mv "$CURDIR"/OpenAFS.pkg "$CURDIR"/dmg
@@ -500,8 +500,8 @@ if [ x"$PASS2" = x1 ]; then
     hdiutil create -srcfolder "$CURDIR"/dmg -volname OpenAFS \
            -o "$CURDIR"/TMP.dmg
     hdiutil convert -format UDZO "$CURDIR"/TMP.dmg \
-           -o "$CURDIR/OpenAFS-@VERSION@-$RELNAME".dmg
+           -o "$CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME".dmg
 
     echo
-    echo "Created $CURDIR/OpenAFS-@VERSION@-$RELNAME".dmg
+    echo "Created $CURDIR/OpenAFS-@PACKAGE_VERSION@-$RELNAME".dmg
 fi

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index 5282c4a68443e1d34bfc45940d3703ef2a33fe9d..d0298d0ba3f8cadea61bec89774f4f8602012f5a 100644 (file)
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -1,6 +1,6 @@
 # Openafs Spec $Revision$
 
-%define afsvers @VERSION@
+%define afsvers @PACKAGE_VERSION@
 %define pkgvers @LINUX_PKGVER@
 # for beta/rc releases make pkgrel 0.<tag>
 # for real releases make pkgrel 1 (or more for extra releases)

diff --git a/src/tests/run-tests.in b/src/tests/run-tests.in
index d0fc73d70bd969d9bd35e577fcf41778e340e57b..1ab12ad1458f027fd63ee215924a748bffec486a 100755 (executable)
--- a/src/tests/run-tests.in
+++ b/src/tests/run-tests.in
@@ -28,8 +28,8 @@ srcdir=@srcdir@
 objdir=`pwd`
 SHELL=/bin/sh
 SHELLVERBOSE=
-VERSION=@VERSION@
-PACKAGE=@PACKAGE@
+VERSION=@PACKAGE_VERSION@
+PACKAGE=@PACKAGE_TARNAME@
 host=@host@
 RUNAS=
 FS=${AFSSRVBINDIR}/fs