Installation script and build fixes to use the proper framework location

under MacOS X (/Library/Frameworks/)

patch from Elifarley C. Coelho.


git-svn-id: http://svn.xiph.org/trunk/ogg@2376 0101bb08-14d6-0310-b084-bc0e0c8e3800

2 files changed, 11 insertions, 80 deletions

diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings
index c13a8ef..e7ba98f 100644
--- a/macosx/English.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/InfoPlist.strings
diff --git a/macosx/ogg.pbproj/project.pbxproj b/macosx/ogg.pbproj/project.pbxproj
index 8fa4100..2d4a615 100644
--- a/macosx/ogg.pbproj/project.pbxproj
+++ b/macosx/ogg.pbproj/project.pbxproj
@@ -75,28 +75,12 @@
 				F582555C019164DF01A802FE,
 				F582554F0191644401A802FE,
 				089C1665FE841158C02AAC07,
-				0867D69AFE84028FC02AAC07,
 				034768DFFF38A50411DB9C8B,
 			);
 			isa = PBXGroup;
 			name = ogg;
 			refType = 4;
 		};
-		0867D69AFE84028FC02AAC07 = {
-			children = (
-				1058C7B0FEA5585E11CA2CBB,
-				1058C7B2FEA5585E11CA2CBB,
-			);
-			isa = PBXGroup;
-			name = "External Frameworks and Libraries";
-			refType = 4;
-		};
-		0867D69BFE84028FC02AAC07 = {
-			isa = PBXFrameworkReference;
-			name = Foundation.framework;
-			path = /System/Library/Frameworks/Foundation.framework;
-			refType = 0;
-		};
 		0867D69CFE84028FC02AAC07 = {
 			buildPhases = (
 				0867D69DFE84028FC02AAC07,
@@ -104,7 +88,6 @@
 				0867D69FFE84028FC02AAC07,
 				0867D6A0FE84028FC02AAC07,
 				0867D6A2FE84028FC02AAC07,
-				F5508CE80191681901A802FE,
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -112,7 +95,7 @@
 				FRAMEWORK_SEARCH_PATHS = "";
 				FRAMEWORK_VERSION = A;
 				HEADER_SEARCH_PATHS = "";
-				INSTALL_PATH = "$(HOME)/Library/Frameworks";
+				INSTALL_PATH = /Library/Frameworks;
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-D__MACOSX__";
 				OTHER_LDFLAGS = "";
@@ -124,8 +107,8 @@
 			dependencies = (
 			);
 			isa = PBXFrameworkTarget;
-			name = ogg;
-			productInstallPath = "$(HOME)/Library/Frameworks";
+			name = Ogg;
+			productInstallPath = /Library/Frameworks;
 			productName = ogg;
 			productReference = 034768E0FF38A50411DB9C8B;
 			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -136,18 +119,24 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>Ogg</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Enables the manipulation of Ogg bitstreams</string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
 	<string></string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Ogg framework</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.11</string>
 	<key>CFBundleSignature</key>
-	<string>????</string>
+	<string>Ogg_</string>
 	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
+	<string>1.11</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
@@ -195,12 +184,6 @@
 			isa = PBXRezBuildPhase;
 			name = "ResourceManager Resources";
 		};
-		0867D6A5FE840307C02AAC07 = {
-			isa = PBXFrameworkReference;
-			name = AppKit.framework;
-			path = /System/Library/Frameworks/AppKit.framework;
-			refType = 0;
-		};
 		089C1665FE841158C02AAC07 = {
 			children = (
 				089C1666FE841158C02AAC07,
@@ -235,62 +218,15 @@
 //082
 //083
 //084
-//100
-//101
-//102
-//103
-//104
-		1058C7B0FEA5585E11CA2CBB = {
-			children = (
-				1058C7B1FEA5585E11CA2CBB,
-			);
-			isa = PBXGroup;
-			name = "Linked Frameworks";
-			refType = 4;
-		};
-		1058C7B1FEA5585E11CA2CBB = {
-			isa = PBXFrameworkReference;
-			name = Cocoa.framework;
-			path = /System/Library/Frameworks/Cocoa.framework;
-			refType = 0;
-		};
-		1058C7B2FEA5585E11CA2CBB = {
-			children = (
-				0867D69BFE84028FC02AAC07,
-				0867D6A5FE840307C02AAC07,
-			);
-			isa = PBXGroup;
-			name = "Other Frameworks";
-			refType = 4;
-		};
-//100
-//101
-//102
-//103
-//104
 //F50
 //F51
 //F52
 //F53
 //F54
-		F5508CE80191681901A802FE = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			generatedFileNames = (
-			);
-			isa = PBXShellScriptBuildPhase;
-			name = "Shell Script";
-			neededFileNames = (
-			);
-			shellPath = /bin/sh;
-			shellScript = "installDir=\"${HOME}/Library/Frameworks\"\nincDir=\"/usr/local/include/ogg\"\nfw=\"ogg.framework\"\n\nmkdir -p \"${installDir}\"\nrm -rf \"${installDir}/${fw}\"\nditto build/${fw} \"${installDir}/${fw}\"\n## ln -s \"${installDir}/${fw}/Headers/*\" \"${incDir}/\"\nmkdir \"${installDir}/${fw}/Headers/ogg\"\nln -s ${installDir}/${fw}/Headers/*.h \"${installDir}/${fw}/Headers/ogg/\"\n\n## /usr/bin/cc -precomp \"${installDir}/${fw}/Headers/ogg.h\" -o \"${installDir}/${fw}/Headers/ogg.p\"\n";
-		};
 		F582554F0191644401A802FE = {
 			children = (
 				F58255530191644401A802FE,
 				F58255540191644401A802FE,
-				F58255570191644401A802FE,
 			);
 			isa = PBXGroup;
 			name = src;
@@ -307,11 +243,6 @@
 			path = framing.c;
 			refType = 4;
 		};
-		F58255570191644401A802FE = {
-			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
-		};
 		F582555A0191644401A802FE = {
 			fileRef = F58255530191644401A802FE;
 			isa = PBXBuildFile;