darwin-generate-module-version-from-version-string-20010712

generate darwin version string from the autoconf version for the module

diff --git a/Makefile.in b/Makefile.in
index 59f12bb20b022373e9bb600db7fd5b2e82204924..44a12dc5a71b890054ebad0ca2521af63d7a2c8c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -517,7 +517,7 @@ distclean: clean
        /bin/rm -f config.log config.cache config.status Makefile
        /bin/rm -f src/config/afsconfig.h src/config/Makefile.${SYS_NAME} 
        /bin/rm -f src/libafs/Makefile src/libafs/MakefileProto.${MKAFS_OSTYPE}
-       /bin/rm -f src/libuafs/Makefile
+       /bin/rm -f src/libuafs/Makefile afs.ppc_darwin.plist src/pam/Makefile
 
 pristine: distclean
        /bin/rm -f src/config/afsconfig.h.in configure aclocal.m4

diff --git a/configure.in b/configure.in
index b7ffb993179d48d64849ad5098d4ef47d1bc4cfc..92c47517a1f40c9d306e489bb535297f362956af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -375,4 +375,5 @@ src/config/Makefile.version-NOCML \
 src/config/Makefile.${AFS_SYSNAME} \
 src/libafs/MakefileProto.${MKAFS_OSTYPE} \
 src/pam/Makefile \
+src/afsd/afs.ppc_darwin.plist \
 )

diff --git a/src/afs/DARWIN/osi_module.c b/src/afs/DARWIN/osi_module.c
index 964d8ea55f16b2068c077b9f89d0eec25f8a9b14..9141b58b147ae7a496cddd1fd4afc4ee08bfb4fd 100644 (file)
--- a/src/afs/DARWIN/osi_module.c
+++ b/src/afs/DARWIN/osi_module.c
@@ -7,8 +7,6 @@ RCSID("$Header$");
 #include "../afs/afsincludes.h"
 #include "../sys/syscall.h"
 #include <mach/kmod.h>
-#define VERSION "1.0.3"
-
 
 struct vfsconf afs_vfsconf;
 extern struct vfsops afs_vfsops;

diff --git a/src/afsd/afs.ppc_darwin.plist b/src/afsd/afs.ppc_darwin.plist
deleted file mode 100644 (file)
index c29e664..0000000
--- a/src/afsd/afs.ppc_darwin.plist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>afs</string>
-       <key>CFBundleIdentifier</key>
-       <string>org.openafs.filesystems.afs</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>afs</string>
-       <key>CFBundlePackageType</key>
-       <string>KEXT</string>
-       <key>CFBundleShortVersionString</key>
-       <string>1.0.3</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0.3</string>
-       <key>OSBundleLibraries</key>
-       <dict>
-               <key>com.apple.kernel.bsd</key>
-               <string>1.0.0b1</string>
-               <key>com.apple.kernel.mach</key>
-               <string>1.0.0b1</string>
-       </dict>
-</dict>
-</plist>

diff --git a/src/afsd/afs.ppc_darwin.plist.in b/src/afsd/afs.ppc_darwin.plist.in
new file mode 100644 (file)
index 0000000..50e5e72
--- /dev/null
+++ b/src/afsd/afs.ppc_darwin.plist.in
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleExecutable</key>
+       <string>afs</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.openafs.filesystems.afs</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleName</key>
+       <string>afs</string>
+       <key>CFBundlePackageType</key>
+       <string>KEXT</string>
+       <key>CFBundleShortVersionString</key>
+       <string>@VERSION@</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleVersion</key>
+       <string>@VERSION@</string>
+       <key>OSBundleLibraries</key>
+       <dict>
+               <key>com.apple.kernel.bsd</key>
+               <string>1.0.0b1</string>
+               <key>com.apple.kernel.mach</key>
+               <string>1.0.0b1</string>
+       </dict>
+</dict>
+</plist>