diff options
| author | rubidium <rubidium@openttd.org> | 2008-08-21 09:51:03 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-08-21 09:51:03 +0000 |
| commit | e30651a80799d40eed39d1505349180bd6fe3fac (patch) | |
| tree | 8bfc3723f9e119501058b3e3dc12864679250638 | |
| parent | 90176a547a76184239fefae88a0e73ca2de88ba5 (diff) | |
| download | openttd-e30651a80799d40eed39d1505349180bd6fe3fac.tar.xz | |
(svn r14121) -Fix: bundle_exe didn't make the output directory, so it failed if you didn't do bundle_zip first.
-Fix: another inconsistency between the "output" of bundle_exe and bundle_[zip|gzip|bzip2|<etc>].
| -rw-r--r-- | Makefile.bundle | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.bundle b/Makefile.bundle index f8f2cd1eb..66490caf4 100644 --- a/Makefile.bundle +++ b/Makefile.bundle @@ -59,10 +59,10 @@ endif $(Q)cp "$(BIN_DIR)/lang/"*.lng "$(LANG_DIR)/" $(Q)cp "$(ROOT_DIR)/readme.txt" "$(BUNDLE_DIR)/" $(Q)cp "$(ROOT_DIR)/COPYING" "$(BUNDLE_DIR)/" - $(Q)cp "$(ROOT_DIR)/known-bugs.txt" "$(BUNDLE_DIR)/docs/" + $(Q)cp "$(ROOT_DIR)/known-bugs.txt" "$(BUNDLE_DIR)/" $(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/" $(Q)cp "$(ROOT_DIR)/docs/32bpp.txt" "$(BUNDLE_DIR)/docs/" - $(Q)cp "$(ROOT_DIR)/changelog.txt" "$(BUNDLE_DIR)/docs/" + $(Q)cp "$(ROOT_DIR)/changelog.txt" "$(BUNDLE_DIR)/" ifdef MAN_DIR $(Q)mkdir -p "$(BUNDLE_DIR)/man/" $(Q)cp "$(ROOT_DIR)/docs/openttd.6" "$(BUNDLE_DIR)/man/" @@ -125,6 +125,7 @@ bundle_dmg: bundle bundle_exe: all @echo '[BUNDLE] Creating $(BUNDLE_NAME).exe' + $(Q)mkdir -p "$(BUNDLES_DIR)" $(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt" $(Q)cd $(ROOT_DIR)/os/win32/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi $(Q)mv $(ROOT_DIR)/os/win32/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe" |