Mac pkg: Use PKGNAME for documentation directory

Although there is little chance that we will ever have a package
conflict on OS X, the convention from our Linux packages is to use the
package name, not the project name, for the name of the documentation
directory.

diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index 646074b3e17eb69c6cbced17eac77024e7ff7933..1811180faf89b67d0961c5a5e022ab3718bda83f 100644 (file)
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -100,8 +100,8 @@ make install DESTDIR=$PKGROOT
 
 if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then
        mkdir -p $PKGROOT/Library/Documentation
-       safedirmove $PKGROOT$DOCDIR $PKGROOT/Library/Documentation/@CMAKE_PROJECT_NAME@ $TMPDIR/__tmpdoc
-       ln -fs /Library/Documentation/@CMAKE_PROJECT_NAME@ $PKGROOT$DOCDIR
+       safedirmove $PKGROOT$DOCDIR $PKGROOT/Library/Documentation/$PACKAGE_NAME $TMPDIR/__tmpdoc
+       ln -fs /Library/Documentation/$PACKAGE_NAME $PKGROOT$DOCDIR
 fi
 
 if [ $UNIVERSAL = 1 -a "$BUILDDIR32" != "" ]; then

diff --git a/release/uninstall.in b/release/uninstall.in
index 353b2a65447ff83694d23705b3100ec92d390738..283a515b0d195bd4e06c2a4e0e31506643fc4b8c 100644 (file)
--- a/release/uninstall.in
+++ b/release/uninstall.in
@@ -100,7 +100,7 @@ if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a -h "$PREFIX/doc" ]; then
        rm $PREFIX/doc 2>&1 || EXITSTATUS=-1
 fi
 rmdir $PREFIX 2>&1 || EXITSTATUS=-1
-rmdir /Library/Documentation/@CMAKE_PROJECT_NAME@ 2>&1 || EXITSTATUS=-1
+rmdir /Library/Documentation/$PACKAGE 2>&1 || EXITSTATUS=-1
 
 if [ -d $RECEIPT ]; then
        echo Removing package receipt ...