From 3cd3810c38b25dcbfa3df49a4ce3c23b94582b29 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 15 Sep 2013 22:52:54 +0000
Subject: Fix INSTALL generation for source code and Mac binary distribution.
 Include CMDLINE files in Mac packages.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2653
---
 Makefile.am         | 3 ++-
 pkg/osx/GNUmakefile | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 074c1112..f52f9eb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,8 @@ DIST_SUBDIRS=pkg $(SUBDIRS)
 if HAVE_PYTHON
 
 INSTALL : man/INSTALL.template man/simplecpp
-	./man/simplecpp < man/INSTALL.template > $@
+	./man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
+	                < man/INSTALL.template > $@
 
 endif
 
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index dc2f4f1a..f1cdbb11 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -90,6 +90,7 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
 	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup"
 
 	$(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__  \
+	                -DDOOM -DHERETIC -DHEXEN -DSTRIFE     \
 	             < $(TOPLEVEL)/man/INSTALL.template       \
 	             > "$(APP_DOC_DIR)/INSTALL"
 
@@ -98,6 +99,7 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
 	mkdir -p "$(APP_BIN_DIR)/man/man5" "$(APP_BIN_DIR)/man/man6"
 	cp $(TOPLEVEL)/man/*.5 "$(APP_BIN_DIR)/man/man5"
 	cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6"
+	cp $(TOPLEVEL)/man/CMDLINE.{doom,heretic,hexen,strife} $(APP_DOC_DIR)
 	cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store
 	cp disk/background.png $(STAGING_DIR)/background.png
 
-- 
cgit v1.2.3