This should allow mac.installer to build without root access

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6483 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -1335,6 +1335,11 @@
         <copy file="${basedir}/build/osx/org.jivesoftware.wildfire.plist"
               todir="${mac.pkg.dir}/Library/LaunchDaemons"/>
         <mkdir dir="${mac.dmg.dir}"/>
+        <mkdir dir="${mac.pkg.dir}/Library/PreferencePanes"/>
+        <copy todir="${mac.pkg.dir}/Library/PreferencePanes">
+            <fileset dir="${basedir}/build/osx/wildfirePrefPane/build/Deployment/Wildfire.prefPane">
+            </fileset>
+        </copy>
         <chmod perm="ug+x">
             <fileset dir="${mac.pkg.dir}/usr/local/wildfire/bin">
                 <include name="extra/wildfire-launchd-wrapper.sh"/>

build/osx/wildfirePrefPane/wildfirePrefPane.xcodeproj/project.pbxproj

@@ -405,7 +405,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUGGING_SYMBOLS = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DSTROOT = "$(PROJECT_DIR)/../../../macpkg";
+				DSTROOT = "$(PROJECT_DIR)/build";
 				FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -419,7 +419,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Library/PreferencePanes;
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = "";
 				LIBRARY_STYLE = Bundle;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
@@ -449,7 +449,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUGGING_SYMBOLS = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DSTROOT = "$(PROJECT_DIR)/../../../macpkg";
+				DSTROOT = "$(PROJECT_DIR)/build";
 				FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -463,7 +463,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Library/PreferencePanes;
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = "";
 				LIBRARY_STYLE = Bundle;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
@@ -496,7 +496,7 @@
 				);
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DSTROOT = "$(PROJECT_DIR)/../../../macpkg";
+				DSTROOT = "$(PROJECT_DIR)/build";
 				FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_ENABLE_TRIGRAPHS = NO;
@@ -508,7 +508,8 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Library/PreferencePanes;
+				INSTALL_MODE_FLAG = "u+w,a+rX";
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = "";
 				LIBRARY_STYLE = Bundle;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
@@ -520,6 +521,7 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = Wildfire;
 				SECTORDER_FLAGS = "";
+				SKIP_INSTALL = NO;
 				SYMROOT = "$(PROJECT_DIR)/build";
 				WARNING_CFLAGS = (
 					"-Wmost",
@@ -535,7 +537,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DSTROOT = "$(PROJECT_DIR)/../../../macpkg";
+				DSTROOT = "$(PROJECT_DIR)/build";
 				FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
 				GCC_ENABLE_TRIGRAPHS = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -546,7 +548,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Library/PreferencePanes;
+				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = "";
 				LIBRARY_STYLE = Bundle;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;