From 184ea9ba501adf04b9b352760774fde268c0cc7f Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 14 May 2011 20:11:26 +0000
Subject: Convert build system to using the PROGRAM_PREFIX system used on
 raven-branch.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2336
---
 pkg/config.make.in        | 1 +
 pkg/osx/GNUmakefile       | 9 ++++-----
 pkg/osx/LauncherManager.m | 6 +++---
 pkg/win32/GNUmakefile     | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'pkg')

diff --git a/pkg/config.make.in b/pkg/config.make.in
index 445e89a9..8f94f945 100644
--- a/pkg/config.make.in
+++ b/pkg/config.make.in
@@ -10,6 +10,7 @@ STRIP = @STRIP@
 
 # Package name and version number:
 
+PROGRAM_PREFIX = @PROGRAM_PREFIX@
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index 514a208d..d53a9981 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -78,10 +78,10 @@ $(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)/setup/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)"
+	$(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup"
 
 	$(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__  \
 	             < $(TOPLEVEL)/man/INSTALL.template       \
@@ -94,7 +94,6 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
 	cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6"
 	cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store
 	cp disk/background.png $(STAGING_DIR)/background.png
-#	setfile -a V $(STAGING_DIR)/background.png
 
 clean : launcher_clean
 	rm -f $(DMG)
diff --git a/pkg/osx/LauncherManager.m b/pkg/osx/LauncherManager.m
index 937c0d98..69c59577 100644
--- a/pkg/osx/LauncherManager.m
+++ b/pkg/osx/LauncherManager.m
@@ -294,8 +294,8 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName)
         return;
     }
 
-    ExecuteProgram(PACKAGE_TARNAME, [iwad UTF8String],
-                                    [args UTF8String]);
+    ExecuteProgram(PROGRAM_PREFIX "doom", [iwad UTF8String],
+                                          [args UTF8String]);
     [NSApp terminate:sender];
 }
 
@@ -306,7 +306,7 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName)
     [self saveConfig];
 
     [self->iwadController setEnvironment];
-    ExecuteProgram("chocolate-setup", NULL, NULL);
+    ExecuteProgram(PROGRAM_PREFIX "setup", NULL, NULL);
 }
 
 // Invoked when the "Terminal" option is selected from the menu, to open
diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile
index 7df4cc16..34f2c9bd 100644
--- a/pkg/win32/GNUmakefile
+++ b/pkg/win32/GNUmakefile
@@ -3,9 +3,9 @@ include ../config.make
 
 TOPLEVEL=../..
 
-EXE_FILES=$(TOPLEVEL)/src/$(PACKAGE_TARNAME).exe       \
-          $(TOPLEVEL)/src/chocolate-server.exe         \
-          $(TOPLEVEL)/setup/chocolate-setup.exe
+EXE_FILES=$(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom.exe    \
+          $(TOPLEVEL)/src/$(PROGRAM_PREFIX)server.exe  \
+          $(TOPLEVEL)/setup/$(PROGRAM_PREFIX)setup.exe
 
 DLL_FILES=$(TOPLEVEL)/src/SDL.dll                      \
           $(TOPLEVEL)/src/SDL_mixer.dll                \
-- 
cgit v1.2.3