diff --git a/MacOSX/build-package.in b/MacOSX/build-package.in index f8b3d107..c729dd8b 100755 --- a/MacOSX/build-package.in +++ b/MacOSX/build-package.in @@ -102,8 +102,8 @@ if test -n "${CODE_SIGN_IDENTITY}"; then else xcodebuild -target NotificationProxy -configuration Release -project NotificationProxy/NotificationProxy.xcodeproj install DSTROOT=$BUILDPATH/target/Library/OpenSC/ fi -mkdir -p "$BUILDPATH/target/Applications" -osacompile -o "$BUILDPATH/target/Applications/OpenSC Notify.app" "MacOSX/OpenSC_Notify.applescript" +mkdir -p "$BUILDPATH/target/Applications/Utilities" +osacompile -o "$BUILDPATH/target/Applications/Utilities/OpenSC Notify.app" "MacOSX/OpenSC_Notify.applescript" # Build OpenSC.tokend when XCode version < 10 @@ -173,6 +173,8 @@ if test -e OpenSCToken -a -n "${CODE_SIGN_IDENTITY}"; then . ./bootstrap BUILDPATH=${BP} xcodebuild -target OpenSCTokenApp -configuration Debug -project OpenSCTokenApp.xcodeproj install DSTROOT=${BUILDPATH}/target_token "$P1" "$P2" "$P3" "$P4" + mkdir ${BUILDPATH}/target_token/Applications/Utilities + mv ${BUILDPATH}/target_token/Applications/OpenSCTokenApp.app ${BUILDPATH}/target_token/Applications/Utilities cd .. else # if no OpenSCToken is checked out, then we create a dummy package diff --git a/MacOSX/opensc-uninstall b/MacOSX/opensc-uninstall index 06481b29..419a6011 100755 --- a/MacOSX/opensc-uninstall +++ b/MacOSX/opensc-uninstall @@ -28,6 +28,8 @@ rm -f /usr/local/lib/onepin-opensc-pkcs11.so # Remove installed files rm -rf /Applications/OpenSCTokenApp.app rm -rf "/Applications/OpenSC Notify.app" +rm -rf /Applications/Utilities/OpenSCTokenApp.app +rm -rf "/Applications/Utilities/OpenSC Notify.app" rm -rf /Library/OpenSC rm -rf /Library/Security/tokend/OpenSC.tokend rm -f /Library/LaunchAgents/pkcs11-register.plist