summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-10-20 07:23:40 +0000
committerrubidium <rubidium@openttd.org>2010-10-20 07:23:40 +0000
commit9e35e80aa1a11329a4f2d94f76323cf533c40845 (patch)
tree73a01c6d42f4b5427000bbe02a23f2bd241bca36
parentc2a7b82a9f58511638883fedca21dad1e5bf4ab9 (diff)
downloadopenttd-9e35e80aa1a11329a4f2d94f76323cf533c40845.tar.xz
(svn r20999) -Change: Add installing options or rather options to not install certain documentation, in a similar way to GRFCodec/catcodec
-rw-r--r--Makefile.bundle.in19
-rw-r--r--os/windows/installer/install.nsi3
2 files changed, 13 insertions, 9 deletions
diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index 08e7a33dc..e6ec689b2 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -72,9 +72,6 @@ endif
$(Q)cp "$(ROOT_DIR)/readme.txt" "$(BUNDLE_DIR)/"
$(Q)cp "$(ROOT_DIR)/COPYING" "$(BUNDLE_DIR)/"
$(Q)cp "$(ROOT_DIR)/known-bugs.txt" "$(BUNDLE_DIR)/"
- $(Q)cp "$(ROOT_DIR)/docs/obg_format.txt" "$(BUNDLE_DIR)/docs/"
- $(Q)cp "$(ROOT_DIR)/docs/obm_format.txt" "$(BUNDLE_DIR)/docs/"
- $(Q)cp "$(ROOT_DIR)/docs/obs_format.txt" "$(BUNDLE_DIR)/docs/"
$(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)/"
@@ -174,7 +171,6 @@ install: bundle
$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
- $(Q)install -d "$(INSTALL_DOC_DIR)"
ifeq ($(TTD), openttd.exe)
$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}.exe"
else
@@ -185,9 +181,18 @@ endif
$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
$(Q)install -m 644 "$(BUNDLE_DIR)/gm/"* "$(INSTALL_DATA_DIR)/gm"
$(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)"
+ifndef DO_NOT_INSTALL_DOCS
+ $(Q)install -d "$(INSTALL_DOC_DIR)"
+ $(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/known-bugs.txt" "$(INSTALL_DOC_DIR)"
+endif
+ifndef DO_NOT_INSTALL_CHANGELOG
+ $(Q)install -d "$(INSTALL_DOC_DIR)"
+ $(Q)install -m 644 "$(BUNDLE_DIR)/changelog.txt" "$(INSTALL_DOC_DIR)"
+endif
+ifndef DO_NOT_INSTALL_LICENSE
+ $(Q)install -d "$(INSTALL_DOC_DIR)"
$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
+endif
$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
ifdef ICON_THEME_DIR
$(Q)install -d "$(INSTALL_ICON_THEME_DIR)"
@@ -207,9 +212,11 @@ else
$(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
endif
ifdef MAN_DIR
+ifndef DO_NOT_INSTALL_MAN
$(Q)install -d "$(INSTALL_MAN_DIR)"
$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
endif
+endif
ifdef MENU_DIR
$(Q)install -d "$(INSTALL_MENU_DIR)"
$(Q)install -m 644 "$(ROOT_DIR)/media/openttd.desktop.install" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index f75073490..4e0adac1b 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -133,9 +133,6 @@ Section "!OpenTTD" Section1
; Copy some documention files
SetOutPath "$INSTDIR\docs\"
- File ${PATH_ROOT}docs\obg_format.txt
- File ${PATH_ROOT}docs\obm_format.txt
- File ${PATH_ROOT}docs\obs_format.txt
File ${PATH_ROOT}docs\multiplayer.txt
File ${PATH_ROOT}docs\32bpp.txt