From 6c6696e569590239ac3de8a618669a97fdee6c1a Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 9 Dec 2016 17:12:12 -0600 Subject: [PATCH] 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. --- release/makemacpkg.in | 4 ++-- release/uninstall.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/makemacpkg.in b/release/makemacpkg.in index 646074b..1811180 100644 --- 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 353b2a6..283a515 100644 --- 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 ... -- 2.40.0