From 73d5f90578c1d87d52737510002d9acf9636ad84 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Mon, 12 Dec 2016 19:20:46 +0000
Subject: [PATCH] Lose one level of Audacity

Previously our .app was created under /Audacity.  Now we create it one higher up.
---
 mac/Audacity.xcodeproj/project.pbxproj | 14 +++++++-------
 mac/scripts/build_dist.sh              |  2 +-
 mac/scripts/install_ladspa_plugins.sh  |  2 +-
 mac/scripts/install_manual.sh          |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj
index 38287f2aa..06eac7a4d 100644
--- a/mac/Audacity.xcodeproj/project.pbxproj
+++ b/mac/Audacity.xcodeproj/project.pbxproj
@@ -1433,7 +1433,7 @@
 		2892CE28131AFB1900E1E17D /* Install miscellany */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 8;
-			dstPath = /Audacity/Audacity.app/Contents;
+			dstPath = /Audacity.app/Contents;
 			dstSubfolderSpec = 0;
 			files = (
 				28006FFC132C169700BD34D7 /* Install.txt in Install miscellany */,
@@ -8082,7 +8082,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "AUDACITY_DLL_API=\"\"";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Audacity;
+				INSTALL_PATH = /;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -8334,7 +8334,7 @@
 					CC_HASVISIBILITY,
 				);
 				GENERATE_MASTER_OBJECT_FILE = YES;
-				INSTALL_PATH = /Audacity/modules;
+				INSTALL_PATH = /modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
 				OTHER_CFLAGS = "$(WX_CFLAGS)";
@@ -8412,7 +8412,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "AUDACITY_DLL_API=\"\"";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Audacity;
+				INSTALL_PATH = /;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -8664,7 +8664,7 @@
 					CC_HASVISIBILITY,
 				);
 				GENERATE_MASTER_OBJECT_FILE = YES;
-				INSTALL_PATH = /Audacity/modules;
+				INSTALL_PATH = /modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
 				OTHER_CFLAGS = "$(WX_CFLAGS)";
@@ -8807,7 +8807,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = CC_HASVISIBILITY;
 				GENERATE_MASTER_OBJECT_FILE = YES;
-				INSTALL_PATH = /Audacity/modules;
+				INSTALL_PATH = /modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
 				OTHER_CFLAGS = "$(WX_CFLAGS)";
@@ -8837,7 +8837,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = CC_HASVISIBILITY;
 				GENERATE_MASTER_OBJECT_FILE = YES;
-				INSTALL_PATH = /Audacity/modules;
+				INSTALL_PATH = /modules;
 				KEEP_PRIVATE_EXTERNS = NO;
 				MACH_O_TYPE = mh_dylib;
 				OTHER_CFLAGS = "$(WX_CFLAGS)";
diff --git a/mac/scripts/build_dist.sh b/mac/scripts/build_dist.sh
index e20306df5..be30a5575 100755
--- a/mac/scripts/build_dist.sh
+++ b/mac/scripts/build_dist.sh
@@ -93,7 +93,7 @@ hdiutil convert TMP.dmg -format UDZO -imagekey zlib-level=9 -o "$DMG.dmg"
 
 # Create zip version
 rm -rf "${DMG}/.background"
-rm -rf "${DMG}/Audacity/help/"
+rm -rf "${DMG}/Audacity.app/help/"
 zip -r9 "${DMG}.zip" "${DMG}"
 
 # Cleanup
diff --git a/mac/scripts/install_ladspa_plugins.sh b/mac/scripts/install_ladspa_plugins.sh
index f078783e8..35cc0c75d 100755
--- a/mac/scripts/install_ladspa_plugins.sh
+++ b/mac/scripts/install_ladspa_plugins.sh
@@ -102,7 +102,7 @@ case "${ACTION}" in
    ;;
 
    install)
-      TARGET_BUILD_DIR="${DSTROOT}/Audacity/Audacity.app/Contents/plug-ins"
+      TARGET_BUILD_DIR="${DSTROOT}/Audacity.app/Contents/plug-ins"
       installAction
    ;;
 
diff --git a/mac/scripts/install_manual.sh b/mac/scripts/install_manual.sh
index 5a8c5e242..b2e8fd001 100755
--- a/mac/scripts/install_manual.sh
+++ b/mac/scripts/install_manual.sh
@@ -48,7 +48,7 @@ case "${ACTION}" in
    ;;
 
    install)
-      TARGET_BUILD_DIR="${DSTROOT}/Audacity/Audacity.app/Contents/help/manual"
+      TARGET_BUILD_DIR="${DSTROOT}/Audacity.app/Contents/help/manual"
       installAction
    ;;