summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2004-12-12 18:10:35 +0000
committerbjarni <bjarni@openttd.org>2004-12-12 18:10:35 +0000
commit625b0ffec02809cef19d67a63db580905209b083 (patch)
tree58799fd6a6f3c4acb3388f48d8f5a81454f86795
parent532aa593a67e769560e107b1637072809ea061cd (diff)
downloadopenttd-625b0ffec02809cef19d67a63db580905209b083.tar.xz
(svn r1034) Makefile: fixed issue where it would not compile if RELEASE string contained space. Did the same fix to OSXAPP, just in case it's changed to something containing space at a later date
-rw-r--r--Makefile28
1 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 970a1635b..a245d8f37 100644
--- a/Makefile
+++ b/Makefile
@@ -636,21 +636,21 @@ $(TTD): table/strings.h $(ttd_OBJS) $(MAKE_CONFIG)
$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) $(VERBOSE_FILTER)
$(OSX):
- @rm -fr $(OSXAPP)
- @mkdir -p $(OSXAPP)/Contents/MacOS
- @mkdir -p $(OSXAPP)/Contents/Resources
- @mkdir -p $(OSXAPP)/Contents/Data
- @mkdir -p $(OSXAPP)/Contents/Lang
- @echo "APPL????" > $(OSXAPP)/Contents/PkgInfo
- @cp os/macos/ttd.icns $(OSXAPP)/Contents/Resources/openttd.icns
- @os/macos/plistgen.sh $(OSXAPP) $(REV)
- @cp os/macos/track_starter $(OSXAPP)/contents/macos
+ @rm -fr "$(OSXAPP)"
+ @mkdir -p "$(OSXAPP)"/Contents/MacOS
+ @mkdir -p "$(OSXAPP)"/Contents/Resources
+ @mkdir -p "$(OSXAPP)"/Contents/Data
+ @mkdir -p "$(OSXAPP)"/Contents/Lang
+ @echo "APPL????" > "$(OSXAPP)"/Contents/PkgInfo
+ @cp os/macos/ttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns
+ @os/macos/plistgen.sh "$(OSXAPP)" "$(REV)"
+ @cp os/macos/track_starter "$(OSXAPP)"/contents/macos
@ls os/macos | grep -q "\.class" || \
javac os/macos/OpenTTDMidi.java
- @cp os/macos/OpenTTDMidi.class $(OSXAPP)/contents/macos
- @cp data/* $(OSXAPP)/Contents/data/
- @cp lang/*.lng $(OSXAPP)/Contents/lang/
- @cp $(TTD) $(OSXAPP)/Contents/MacOS/$(TTD)
+ @cp os/macos/OpenTTDMidi.class "$(OSXAPP)"/contents/macos
+ @cp data/* "$(OSXAPP)"/Contents/data/
+ @cp lang/*.lng "$(OSXAPP)"/Contents/lang/
+ @cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD)
$(endwarnings): $(64_bit_warnings)
@@ -713,7 +713,7 @@ rev.c: FORCE
@echo 'const int _revision_number = $(REV_NUMBER);' >>rev.c.new
@# some additions for MorphOS versions tag
@echo '#ifdef __MORPHOS__' >>rev.c.new
- @echo 'const char morphos_versions_tag[] = "\\0$$VER: OpenTTD '$(REV)' ('${BUILDDATE}') © OpenTTD Team [MorphOS, PowerPC]";' >>rev.c.new
+ @echo 'const char morphos_versions_tag[] = "\\0$$VER: OpenTTD "'$(REV)'" ('${BUILDDATE}') © OpenTTD Team [MorphOS, PowerPC]";' >>rev.c.new
@echo '#endif' >>rev.c.new
@# Only update the real rev.c if it actually changed, to prevent
@# useless rebuilds.