shithub: choc

Info  •  Files  •  Log  •  Branches

Fix INSTALL generation for source code and Mac binary distribution.
Include CMDLINE files in Mac packages.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2653

--- a/Makefile.am

+++ b/Makefile.am

@@ -60,7 +60,8 @@

 if HAVE_PYTHON

 INSTALL : man/INSTALL.template man/simplecpp

-	./man/simplecpp < man/INSTALL.template > $@

+	./man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \

+	                < man/INSTALL.template > $@

 endif

--- a/pkg/osx/GNUmakefile

+++ b/pkg/osx/GNUmakefile

@@ -90,6 +90,7 @@

 	$(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 @@

 	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