From eadead4e050198c3b17cfaa9d537d55043fabbbb Mon Sep 17 00:00:00 2001 From: Matt Cegielka Date: Wed, 24 Aug 2011 11:29:43 +0100 Subject: [PATCH] Handle spaces in output directories --- src/MacVim/MacVim.xcodeproj/project.pbxproj | 2 +- src/MacVim/icons/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj index 1e63ea668b..9c3522e12c 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj @@ -538,7 +538,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Clear deployment target, else the python script always thinks we're building on Tiger\nunset MACOSX_DEPLOYMENT_TARGET\n\n# Generate the icons (redirect stderr to ignore warnings)\ncd $PROJECT_DIR/icons/\nmake OUTDIR=$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH 2> /dev/null\n"; + shellScript = "# Clear deployment target, else the python script always thinks we're building on Tiger\nunset MACOSX_DEPLOYMENT_TARGET\n\n# Generate the icons (redirect stderr to ignore warnings)\ncd \"$PROJECT_DIR\"/icons/\nmake OUTDIR=\"$TARGET_BUILD_DIR\"/$UNLOCALIZED_RESOURCES_FOLDER_PATH 2> /dev/null\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/src/MacVim/icons/Makefile b/src/MacVim/icons/Makefile index 063025003d..97fa408ac2 100644 --- a/src/MacVim/icons/Makefile +++ b/src/MacVim/icons/Makefile @@ -16,12 +16,12 @@ OUTDIR ?= . # step requires an internet connection. $(OUTDIR)/MacVim-generic.icns: - cp -pR MacVim-*.icns $(OUTDIR)/ + cp -pR MacVim-*.icns "$(OUTDIR)"/ all: make_icons.py vim-noshadow-512.png loadfont.so rm -f MacVim-*.icns $(MAKE) -C makeicns - /usr/bin/python make_icons.py $(OUTDIR) + /usr/bin/python make_icons.py "$(OUTDIR)" loadfont.so: loadfont.c /usr/bin/python setup.py install --install-lib . @@ -40,6 +40,6 @@ EnvyCodeR.zip: clean: $(MAKE) -C makeicns clean - rm -f $(OUTDIR)/MacVim-*.icns loadfont.so *.pyc \ + rm -f "$(OUTDIR)"/MacVim-*.icns loadfont.so *.pyc \ EnvyCodeR.zip *.ttf *.reg *.txt rm -rf *.egginfo build # Created by setup.py