From 44195213603087c93f3a4415bf88d12305ea1a7d Mon Sep 17 00:00:00 2001
From: Patric Stout <truebrain@openttd.org>
Date: Sun, 23 Feb 2020 13:41:35 +0100
Subject: [PATCH 1/2] Remove: [Makefile] documentation is now supplied, no
 longer generated

This means 'make doc' didn't do anything anymore.
---
 Makefile | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index 1e405a5f..9b70c66d 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ all: bundle_tar
 # general definitions (no rules!)
 -include Makefile.dist
 .PHONY: all clean distclean
-.PHONY: bananas doc gfx grf lng nml obg
+.PHONY: bananas gfx grf lng nml obg
 .PHONY: bundle     bundle_tar bundle_bzip bundle_gzip bundle_xz   bundle_zip
 .PHONY: bundle_src check      bundle_bsrc bundle_gsrc bundle_xsrc bundle_zsrc
 
@@ -332,34 +332,6 @@ maintainer-clean::
 	$(_V) -rm -rf $(MD5_SRC_FILENAME)
 
 
-################################################################
-#
-# Target doc
-#
-# Generate documentation files.
-#
-################################################################
-
-doc: $(DOC_FILES)
-
-%.txt: %.ptxt Makefile.vcs
-	$(_E) "[DOC] $@"
-	$(_V) cat $< \
-		| sed -e "s/$(REPLACE_TITLE)/$(REPO_TITLE)/" \
-		| sed -e "s/$(REPLACE_GRFID)/$(GRF_ID)/" \
-		| sed -e "s/$(REPLACE_FILENAME)/$(OUTPUT_FILENAME)/" \
-		> $@
-ifeq ($(UNIX2DOS),)
-	$(_E) Warning: unix2dos not available. $@ keeps current eol style.
-else
-	$(_V) $(UNIX2DOS) $(UNIX2DOS_FLAGS) $@
-endif
-
-clean::
-	$(_E) "[CLEAN DOC]"
-	$(_V) -for i in $(patsubst %.txt,%,$(DOC_FILES)); do [ -f $$i.ptxt ] && [ -f $$i.txt ] && rm -rf $$i.txt || true; done
-
-
 ################################################################
 #
 # Target obg
@@ -663,9 +635,6 @@ endif
 help:
 	$(_E) "all:         Build the entire NewGRF and its documentation"
 	$(_E) "install:     Install into the default NewGRF directory ($(INSTALL_DIR))"
-ifdef DOC_FILES
-	$(_E) "doc:         Build the documentation ($(DOC_FILES))"
-endif
 ifdef GFX_SCRIPT_LIST_FILES
 	$(_E) "gfx:         Build the graphics dependencies"
 endif

From 27b16f11e76b71b46cd1a37e14cbea1bb00f8ddf Mon Sep 17 00:00:00 2001
From: Patric Stout <truebrain@openttd.org>
Date: Sun, 23 Feb 2020 13:55:37 +0100
Subject: [PATCH 2/2] Remove: [Makefile] unix2dos is no longer used

---
 Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9b70c66d..2a1cdad2 100644
--- a/Makefile
+++ b/Makefile
@@ -94,8 +94,6 @@ DEFAULT_BRANCH_NAME ?= master
 AWK            ?= awk
 GREP           ?= grep
 PYTHON         ?= python
-UNIX2DOS       ?= $(shell which unix2dos)
-UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version >/dev/null 2>&1 && echo "-q" || echo "")
 
 # Graphics processing
 GIMP           ?= $(shell which gimp)
@@ -678,7 +676,6 @@ endif
 	$(_E) "AWK                     defaults: $(AWK)"
 	$(_E) "GREP                    defaults: $(GREP)"
 	$(_E) "GRFID GRFID_FLAGS.      defaults: $(GRFID) $(GRFID_FLAGS)"
-	$(_E) "UNIX2DOS UNIX2DOS_FLAGS defaults: $(UNIX2DOS) $(UNIX2DOS_FLAGS)"
 ifdef GFX_SCRIPT_LIST_FILES
 	$(_E) "GIMP GIMP_FLAGS         defaults: $(GIMP) $(GIMP_FLAGS)"
 endif