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
---
 setup/Makefile.am           | 11 +++++------
 setup/configfile.c          |  6 +++---
 setup/setup-manifest.xml    | 33 ---------------------------------
 setup/setup-manifest.xml.in | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 42 deletions(-)
 delete mode 100644 setup/setup-manifest.xml
 create mode 100644 setup/setup-manifest.xml.in

(limited to 'setup')

diff --git a/setup/Makefile.am b/setup/Makefile.am
index 91c7449a..96003ce0 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -3,7 +3,7 @@ gamesdir = $(prefix)/games
 
 AM_CFLAGS = -I../textscreen -I../src @SDLMIXER_CFLAGS@
 
-games_PROGRAMS = chocolate-setup
+games_PROGRAMS = @PROGRAM_PREFIX@setup
 
 SOURCE_FILES =                                  \
     compatibility.c   compatibility.h           \
@@ -22,16 +22,15 @@ SOURCE_FILES =                                  \
     txt_mouseinput.c  txt_mouseinput.h
 
 EXTRA_DIST=                                     \
-    setup_icon.c                                \
-    setup-manifest.xml
+    setup_icon.c
 
 if HAVE_WINDRES
-chocolate_setup_SOURCES=$(SOURCE_FILES) setup-res.rc
+@PROGRAM_PREFIX@setup_SOURCES=$(SOURCE_FILES) setup-res.rc
 else
-chocolate_setup_SOURCES=$(SOURCE_FILES)
+@PROGRAM_PREFIX@setup_SOURCES=$(SOURCE_FILES)
 endif
 
-chocolate_setup_LDADD =                              \
+@PROGRAM_PREFIX@setup_LDADD =                        \
                        ../wince/libc_wince.a         \
                        ../textscreen/libtextscreen.a \
                        @SDLMIXER_LIBS@               \
diff --git a/setup/configfile.c b/setup/configfile.c
index c7109739..6a6eb3f6 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -637,9 +637,9 @@ void M_LoadDefaults (void)
     else
     {
         extra_defaults.filename 
-            = malloc(strlen(configdir) + strlen(PACKAGE_TARNAME) + 10);
-        sprintf(extra_defaults.filename, "%s%s.cfg", 
-                configdir, PACKAGE_TARNAME);
+            = malloc(strlen(configdir) + strlen(PROGRAM_PREFIX) + 15);
+        sprintf(extra_defaults.filename, "%s%sdoom.cfg", 
+                configdir, PROGRAM_PREFIX);
     }
 
     LoadDefaultCollection(&doom_defaults);
diff --git a/setup/setup-manifest.xml b/setup/setup-manifest.xml
deleted file mode 100644
index c2788306..00000000
--- a/setup/setup-manifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!-- Magic manifest file that should make Windows Vista/7 not
-     attempt to gain elevated privileges for chocolate-setup.
-     
-     Based on:
-     
-     http://www.cygwin.com/ml/cygwin/2006-12/msg00580.html
-  -->
-
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <!-- The "name" field in this tag should be the same as the executable's
-       name -->
-  <assemblyIdentity version="0.0.0.0" processorArchitecture="X86"
-                    name="chocolate-setup.exe" type="win32"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-
-  <!-- Stop the Program Compatibility Assistant appearing: -->
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- 7 -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!-- Vista -->
-    </application>
-  </compatibility>
-</assembly>
-
diff --git a/setup/setup-manifest.xml.in b/setup/setup-manifest.xml.in
new file mode 100644
index 00000000..ff879263
--- /dev/null
+++ b/setup/setup-manifest.xml.in
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!-- Magic manifest file that should make Windows Vista/7 not
+     attempt to gain elevated privileges for chocolate-setup.
+     
+     Based on:
+     
+     http://www.cygwin.com/ml/cygwin/2006-12/msg00580.html
+  -->
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <!-- The "name" field in this tag should be the same as the executable's
+       name -->
+  <assemblyIdentity version="0.0.0.0" processorArchitecture="X86"
+                    name="@PROGRAM_PREFIX@setup.exe" type="win32"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <!-- Stop the Program Compatibility Assistant appearing: -->
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- 7 -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!-- Vista -->
+    </application>
+  </compatibility>
+</assembly>
+
-- 
cgit v1.2.3