mirror of https://github.com/OpenTTD/OpenTTD.git
Fix: A few places still referred to old name of COPYING and README
This commit is contained in:
parent
f5b72059be
commit
dd07b23ed3
|
@ -243,7 +243,7 @@ Patchpack discussions and related topics may be found in community sites such as
|
||||||
|
|
||||||
### License
|
### License
|
||||||
|
|
||||||
By contributing your code, you agree to license your contribution under the [GPL v2](https://github.com/OpenTTD/OpenTTD/blob/master/COPYING).
|
By contributing your code, you agree to license your contribution under the [GPL v2](https://github.com/OpenTTD/OpenTTD/blob/master/COPYING.md).
|
||||||
|
|
||||||
|
|
||||||
### Privacy Notice
|
### Privacy Notice
|
||||||
|
|
|
@ -69,10 +69,10 @@ endif
|
||||||
$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat" "$(BASESET_DIR)/"
|
$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat" "$(BASESET_DIR)/"
|
||||||
$(Q)cp "$(BIN_DIR)/baseset/"*.obm "$(BASESET_DIR)/"
|
$(Q)cp "$(BIN_DIR)/baseset/"*.obm "$(BASESET_DIR)/"
|
||||||
$(Q)cp "$(BIN_DIR)/lang/"*.lng "$(LANG_DIR)/"
|
$(Q)cp "$(BIN_DIR)/lang/"*.lng "$(LANG_DIR)/"
|
||||||
$(Q)cp "$(ROOT_DIR)/README.md" "$(BUNDLE_DIR)/"
|
$(Q)cp "$(ROOT_DIR)/README.md" "$(BUNDLE_DIR)/"
|
||||||
$(Q)cp "$(ROOT_DIR)/COPYING" "$(BUNDLE_DIR)/"
|
$(Q)cp "$(ROOT_DIR)/COPYING.md" "$(BUNDLE_DIR)/"
|
||||||
$(Q)cp "$(ROOT_DIR)/known-bugs.txt" "$(BUNDLE_DIR)/"
|
$(Q)cp "$(ROOT_DIR)/known-bugs.txt" "$(BUNDLE_DIR)/"
|
||||||
$(Q)cp "$(ROOT_DIR)/docs/multiplayer.md" "$(BUNDLE_DIR)/docs/"
|
$(Q)cp "$(ROOT_DIR)/docs/multiplayer.md" "$(BUNDLE_DIR)/docs/"
|
||||||
$(Q)cp "$(ROOT_DIR)/changelog.txt" "$(BUNDLE_DIR)/"
|
$(Q)cp "$(ROOT_DIR)/changelog.txt" "$(BUNDLE_DIR)/"
|
||||||
ifdef MAN_DIR
|
ifdef MAN_DIR
|
||||||
$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
|
$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
|
||||||
|
@ -88,7 +88,7 @@ ifdef MENU_DIR
|
||||||
$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
|
$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
|
||||||
endif
|
endif
|
||||||
ifeq ($(TTD), openttd.exe)
|
ifeq ($(TTD), openttd.exe)
|
||||||
$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
|
$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/README.md" "$(BUNDLE_DIR)/COPYING.md" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
### Packing the current bundle into several compressed file formats ###
|
### Packing the current bundle into several compressed file formats ###
|
||||||
|
@ -153,7 +153,7 @@ bundle_dmg: bundle
|
||||||
bundle_exe: all
|
bundle_exe: all
|
||||||
@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
|
@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
|
||||||
$(Q)mkdir -p "$(BUNDLES_DIR)"
|
$(Q)mkdir -p "$(BUNDLES_DIR)"
|
||||||
$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(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.md" "$(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)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"
|
$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
|
||||||
|
|
||||||
|
@ -190,7 +190,7 @@ ifndef DO_NOT_INSTALL_CHANGELOG
|
||||||
endif
|
endif
|
||||||
ifndef DO_NOT_INSTALL_LICENSE
|
ifndef DO_NOT_INSTALL_LICENSE
|
||||||
$(Q)install -d "$(INSTALL_DOC_DIR)"
|
$(Q)install -d "$(INSTALL_DOC_DIR)"
|
||||||
$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
|
$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING.md" "$(INSTALL_DOC_DIR)"
|
||||||
endif
|
endif
|
||||||
$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
|
$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
|
||||||
ifdef ICON_THEME_DIR
|
ifdef ICON_THEME_DIR
|
||||||
|
|
|
@ -618,7 +618,7 @@ list of available NewGRFs. Once you have all missing files, you are set to go.
|
||||||
## 9.0) Licensing
|
## 9.0) Licensing
|
||||||
|
|
||||||
OpenTTD is licensed under the GNU General Public License version 2.0. For
|
OpenTTD is licensed under the GNU General Public License version 2.0. For
|
||||||
the complete license text, see the file 'COPYING'. This license applies
|
the complete license text, see the file 'COPYING.md'. This license applies
|
||||||
to all files in this distribution, except as noted below.
|
to all files in this distribution, except as noted below.
|
||||||
|
|
||||||
The squirrel implementation in src/3rdparty/squirrel is licensed under
|
The squirrel implementation in src/3rdparty/squirrel is licensed under
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
<!-- page 1: introductory page -->
|
<!-- page 1: introductory page -->
|
||||||
<PAGE INDEX="1" TYPE="README">
|
<PAGE INDEX="1" TYPE="README">
|
||||||
<NEXTBUTTON TARGET=2>~Next</NEXTBUTTON>
|
<NEXTBUTTON TARGET=2>~Next</NEXTBUTTON>
|
||||||
<README EXTRACTFROMPCK="1">README.TXT</README>
|
<README EXTRACTFROMPCK="1">README.md</README>
|
||||||
<TEXT>Welcome to the OpenTTD installer. This program will install OpenTTD 1.0 on your system. Before we begin the installation process, please take a moment to read the following document.
|
<TEXT>Welcome to the OpenTTD installer. This program will install OpenTTD 1.0 on your system. Before we begin the installation process, please take a moment to read the following document.
|
||||||
|
|
||||||
Select "Next" to continue, or "Cancel" to abort installation.</TEXT>
|
Select "Next" to continue, or "Cancel" to abort installation.</TEXT>
|
||||||
|
@ -80,7 +80,7 @@ Select "Next" to continue, or "Cancel" to abort installation.</TEXT>
|
||||||
<!-- page 2: licence page -->
|
<!-- page 2: licence page -->
|
||||||
<PAGE INDEX="2" TYPE="README">
|
<PAGE INDEX="2" TYPE="README">
|
||||||
<NEXTBUTTON TARGET=3>~Next</NEXTBUTTON>
|
<NEXTBUTTON TARGET=3>~Next</NEXTBUTTON>
|
||||||
<README EXTRACTFROMPCK="1">COPYING</README>
|
<README EXTRACTFROMPCK="1">COPYING.md</README>
|
||||||
<TEXT>OpenTTD is licenced under the GNU General Public License. The text of the licence is below.
|
<TEXT>OpenTTD is licenced under the GNU General Public License. The text of the licence is below.
|
||||||
|
|
||||||
Select "Next" if you agree to this licence.
|
Select "Next" if you agree to this licence.
|
||||||
|
|
|
@ -81,7 +81,7 @@ the original data from the game or install the recommend subackages OpenGFX for
|
||||||
free graphics, OpenSFX for free sounds and OpenMSX for free music.
|
free graphics, OpenSFX for free sounds and OpenMSX for free music.
|
||||||
|
|
||||||
OpenTTD is licensed under the GNU General Public License version 2.0. For more
|
OpenTTD is licensed under the GNU General Public License version 2.0. For more
|
||||||
information, see the file 'COPYING' included with every release and source
|
information, see the file 'COPYING.md' included with every release and source
|
||||||
download of the game.
|
download of the game.
|
||||||
|
|
||||||
%package gui
|
%package gui
|
||||||
|
|
|
@ -63,7 +63,7 @@ Var CDDRIVE
|
||||||
!define MUI_ABORTWARNING
|
!define MUI_ABORTWARNING
|
||||||
!define MUI_WELCOMEPAGE_TITLE_3LINES
|
!define MUI_WELCOMEPAGE_TITLE_3LINES
|
||||||
!insertmacro MUI_PAGE_WELCOME
|
!insertmacro MUI_PAGE_WELCOME
|
||||||
!insertmacro MUI_PAGE_LICENSE "..\..\..\COPYING"
|
!insertmacro MUI_PAGE_LICENSE "..\..\..\COPYING.md"
|
||||||
|
|
||||||
!define MUI_COMPONENTSPAGE_SMALLDESC
|
!define MUI_COMPONENTSPAGE_SMALLDESC
|
||||||
!insertmacro MUI_PAGE_COMPONENTS
|
!insertmacro MUI_PAGE_COMPONENTS
|
||||||
|
@ -156,8 +156,8 @@ Section "!OpenTTD" Section1
|
||||||
File ${PATH_ROOT}changelog.txt
|
File ${PATH_ROOT}changelog.txt
|
||||||
Push "$INSTDIR\changelog.txt"
|
Push "$INSTDIR\changelog.txt"
|
||||||
Call unix2dos
|
Call unix2dos
|
||||||
File ${PATH_ROOT}COPYING
|
File ${PATH_ROOT}COPYING.md
|
||||||
Push "$INSTDIR\COPYING"
|
Push "$INSTDIR\COPYING.md"
|
||||||
Call unix2dos
|
Call unix2dos
|
||||||
File ${PATH_ROOT}README.md
|
File ${PATH_ROOT}README.md
|
||||||
Push "$INSTDIR\README.md"
|
Push "$INSTDIR\README.md"
|
||||||
|
@ -392,7 +392,7 @@ Section "Uninstall"
|
||||||
Delete "$INSTDIR\README.md"
|
Delete "$INSTDIR\README.md"
|
||||||
Delete "$INSTDIR\known-bugs.txt"
|
Delete "$INSTDIR\known-bugs.txt"
|
||||||
Delete "$INSTDIR\openttd.exe"
|
Delete "$INSTDIR\openttd.exe"
|
||||||
Delete "$INSTDIR\COPYING"
|
Delete "$INSTDIR\COPYING.md"
|
||||||
Delete "$INSTDIR\INSTALL.LOG"
|
Delete "$INSTDIR\INSTALL.LOG"
|
||||||
Delete "$INSTDIR\crash.log"
|
Delete "$INSTDIR\crash.log"
|
||||||
Delete "$INSTDIR\crash.dmp"
|
Delete "$INSTDIR\crash.dmp"
|
||||||
|
|
Loading…
Reference in New Issue