diff options
author | Sven Weidauer <sven.weidauer@gmail.com> | 2011-03-14 18:36:41 +0000 |
---|---|---|
committer | Sven Weidauer <sven.weidauer@gmail.com> | 2011-03-14 18:36:41 +0000 |
commit | 7acc13d8630cd55f74b23e41c07bfdac109c4fbf (patch) | |
tree | c4cf8e79401a53d5b5655dd2c17652587e6687bb /cocoa | |
parent | 050eba408d44d8c1a53e5d6ec2a178fc38112e62 (diff) | |
download | netsurf-7acc13d8630cd55f74b23e41c07bfdac109c4fbf.tar.gz netsurf-7acc13d8630cd55f74b23e41c07bfdac109c4fbf.tar.bz2 |
Passing $(DEVELOPER_PATH) to the compile-xib script to select the right ibtool.
svn path=/trunk/netsurf/; revision=12048
Diffstat (limited to 'cocoa')
-rw-r--r-- | cocoa/Makefile.target | 2 | ||||
-rwxr-xr-x | cocoa/compile-xib.sh | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index 143252c5f..ccaacdc97 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -158,7 +158,7 @@ $$(OBJROOT)/$(2).lproj: $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib) $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(1) $$(OBJROOT)/created $(VQ)echo Compiling XIB $(1) for language $(2) $(Q)mkdir -p $$(OBJROOT)/$(2).lproj - $(Q)cocoa/compile-xib.sh cocoa/res/$(1) $(2) $$@ + $(Q)cocoa/compile-xib.sh $(DEVELOPER_PATH) cocoa/res/$(1) $(2) $$@ ifeq ($(wildcard cocoa/res/$(2).lproj/$(1).strings),cocoa/res/$(2).lproj/$(1).strings) $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(2).lproj/$(1).strings diff --git a/cocoa/compile-xib.sh b/cocoa/compile-xib.sh index 264d87761..37388c797 100755 --- a/cocoa/compile-xib.sh +++ b/cocoa/compile-xib.sh @@ -1,20 +1,20 @@ #!/bin/sh # call: compile-xib.sh [xib file] [language] [(optional output nib file)] -DIR=`dirname "$1"` -XIB=`basename -s .xib "$1"` +DIR=`dirname "$2"` +XIB=`basename -s .xib "$2"` -STRINGS_FILE="$DIR/$2.lproj/$XIB.xib.strings" +STRINGS_FILE="$DIR/$3.lproj/$XIB.xib.strings" TRANSLATE="" if [ -f $STRINGS_FILE ] then TRANSLATE="--strings-file $STRINGS_FILE" fi -OUTPUT="$2.$XIB.nib" +OUTPUT="$3.$XIB.nib" -if [ "x$3" != "x" ] +if [ "x$4" != "x" ] then - OUTPUT="$3" + OUTPUT="$4" fi -exec ibtool $TRANSLATE --compile $OUTPUT $1 +exec $1/usr/bin/ibtool $TRANSLATE --compile $OUTPUT $2 |