diff options
| author | rubidium <rubidium@openttd.org> | 2008-11-16 13:05:39 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-11-16 13:05:39 +0000 |
| commit | 1fa4be9d6d2bba27c453bedeec2feee1fc14546f (patch) | |
| tree | 32400ba11216fa195d02c09ebcf9e4426030709a | |
| parent | 24bd9866f8e37d1b28ba39a1c3776cceb2ac61f0 (diff) | |
| download | openttd-1fa4be9d6d2bba27c453bedeec2feee1fc14546f.tar.xz | |
(svn r14580) -Fix [FS#2404]: scripts directory not being copied into bundles.
| -rw-r--r-- | Makefile.bundle.in | 3 | ||||
| -rw-r--r-- | os/win32/installer/install.nsi | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.bundle.in b/Makefile.bundle.in index 66ee9c9e9..eb3b7238d 100644 --- a/Makefile.bundle.in +++ b/Makefile.bundle.in @@ -39,6 +39,7 @@ bundle: all $(Q)mkdir -p "$(BUNDLE_DIR)/scenario" $(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap" $(Q)mkdir -p "$(BUNDLE_DIR)/media" + $(Q)mkdir -p "$(BUNDLE_DIR)/scripts" $(Q)mkdir -p "$(TTD_DIR)" $(Q)mkdir -p "$(DATA_DIR)" $(Q)mkdir -p "$(LANG_DIR)" @@ -69,6 +70,7 @@ ifdef MAN_DIR endif $(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/" $(Q)cp "$(ROOT_DIR)/media/openttd."*.png "$(BUNDLE_DIR)/media/" + $(Q)cp "$(BIN_DIR)/scripts/"* "$(BUNDLE_DIR)/scripts/" ifdef MENU_DIR $(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/" $(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install" @@ -149,6 +151,7 @@ else endif $(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang" $(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data" + $(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts" $(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)" $(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)" $(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)" diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index 428db5100..289d8947d 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -120,6 +120,10 @@ Section "!OpenTTD" Section1 SetOutPath "$INSTDIR\scenario\heightmap\" File /nonfatal ${PATH_ROOT}bin\scenario\heightmap\*.* + ; Copy the scripts + SetOutPath "$INSTDIR\scripts\" + File ${PATH_ROOT}bin\scripts\*.* + ; Copy the rest of the stuff SetOutPath "$INSTDIR\" @@ -296,6 +300,9 @@ Section "Uninstall" ; Language files Delete "$INSTDIR\lang\*.lng" + ; Scripts + Delete "$INSTDIR\scripts\*.lng" + ; Remove remaining directories RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\" RMDir "$SMPROGRAMS\$SHORTCUTS" |