From 484c1484c9ae01354b1910bae5ed8a729e00b3be Mon Sep 17 00:00:00 2001 From: David Adam Date: Mon, 4 Apr 2016 14:33:35 +0800 Subject: Customisable extra configuration, completion and function directories - Add options to the autotools build to set the path for the "vendor" or "extra" configuration snippets, functions and completions directories. - Remove the vendor_completions directory from the Xcode build, as these are relocatable and compiling the paths in does not make sense. This allows packaging tools like Homebrew and Nix to use a common directory outside of the main prefix for third-party completions, and to make these available for programmatic discovery through `pkg-config`. Closes #2113 --- fish.xcodeproj/project.pbxproj | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'fish.xcodeproj') diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index 0f7e5efc..6d2ca902 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -24,7 +24,6 @@ buildPhases = ( D07D266915E33B86009E43F6 /* CopyFiles */, D07D266B15E33B86009E43F6 /* Copy Files */, - D01A25E11AF58D8C002F9E92 /* ShellScript */, D01A2CA716965ADD00767098 /* CopyFiles */, ); dependencies = ( @@ -55,7 +54,6 @@ D0F019FC15A977B40034B3B1 /* CopyFiles */, D033780F15DC6D2A00A634BA /* CopyFiles */, D01A2C9B16964C8200767098 /* Copy Files */, - D01A25E01AF58CD0002F9E92 /* ShellScript */, ); dependencies = ( D0F01A1315AA36280034B3B1 /* PBXTargetDependency */, @@ -1048,32 +1046,6 @@ shellPath = /bin/sh; shellScript = ./build_tools/xcode_version_gen.sh; }; - D01A25E01AF58CD0002F9E92 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "mkdir -p -m 755 \"${TARGET_BUILD_DIR}/base/share/fish/vendor_completions.d\""; - }; - D01A25E11AF58D8C002F9E92 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 8; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 1; - shellPath = /bin/sh; - shellScript = "mkdir -p -m 755 \"${INSTALL_ROOT}/${INSTALL_PATH}/share/fish/vendor_completions.d\""; - }; D0A564EB168CFDDE00AF6161 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; -- cgit v1.2.3