foxygit / doom Log in
commit 52f81b4ef175358d1e1f7f9eecab2a1edb7f4b65
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Fri Feb 5 23:30:22 2010 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Fri Feb 5 23:30:22 2010 +0000

    Update OS X Makefile to include Heretic and Hexen executables, and to
    correct the setup location.

    Subversion-branch: /branches/raven-branch
    Subversion-revision: 1847
---
 pkg/osx/GNUmakefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index d119efa1..a0f6151f 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -58,10 +58,14 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
 	cp launcher "$(APP_BIN_DIR)"
 	$(STRIP) "$(APP_BIN_DIR)/launcher"

-	./cp-with-libs $(TOPLEVEL)/src/$(PACKAGE_TARNAME) "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/$(PACKAGE_TARNAME)"
-	./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)"
-	$(STRIP) "$(APP_BIN_DIR)/chocolate-setup"
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom"
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)heretic "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)heretic"
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)hexen "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)hexen"
+	./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup"

 	find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true