diff options
| author | glx <glx@openttd.org> | 2019-10-23 02:03:53 +0200 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-10-23 15:05:40 +0200 |
| commit | 93e42a94074db1b6f18858be5fe00d9801c100c1 (patch) | |
| tree | 501ad9d35a7c8a3fa993517d8ec13bdc1c5d941c | |
| parent | 5fbacf9d860ae912111414c3c0936449b78cdb76 (diff) | |
| download | openttd-93e42a94074db1b6f18858be5fe00d9801c100c1.tar.xz | |
Fix 3575dd551: update names for installer
| -rw-r--r-- | Makefile.bundle.in | 2 | ||||
| -rw-r--r-- | os/windows/installer/install.nsi | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.bundle.in b/Makefile.bundle.in index 2a7d4cbf9..685800dd3 100644 --- a/Makefile.bundle.in +++ b/Makefile.bundle.in @@ -153,7 +153,7 @@ bundle_dmg: bundle bundle_exe: all @echo '[BUNDLE] Creating $(BUNDLE_NAME).exe' $(Q)mkdir -p "$(BUNDLES_DIR)" - $(Q)unix2dos "$(ROOT_DIR)/docs/"*.txt "$(ROOT_DIR)/README.md" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt" + $(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/README.md" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt" $(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi $(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe" diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index d08f6eb7b..8c65ca4e6 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -145,8 +145,8 @@ Section "!OpenTTD" Section1 ; Copy some documentation files SetOutPath "$INSTDIR\docs\" - File ${PATH_ROOT}docs\multiplayer.txt - Push "$INSTDIR\docs\multiplayer.txt" + File ${PATH_ROOT}docs\multiplayer.md + Push "$INSTDIR\docs\multiplayer.md" Call unix2dos ; Copy the rest of the stuff @@ -218,7 +218,7 @@ Section "!OpenTTD" Section1 CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Changelog.lnk" "$INSTDIR\Changelog.txt" CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Known-bugs.lnk" "$INSTDIR\known-bugs.txt" CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Docs" - CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\Multiplayer.lnk" "$INSTDIR\docs\multiplayer.txt" + CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\Multiplayer.lnk" "$INSTDIR\docs\multiplayer.md" CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Scripts" CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Scripts\Readme.lnk" "$INSTDIR\scripts\README.md" !insertmacro MUI_STARTMENU_WRITE_END |