commit d0f41d4163fc96168f56155e6f5b36025eea79e4
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Nov 21 17:07:37 2009 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Nov 21 17:07:37 2009 +0000
Make assembly name in setup-manifest.xml use PROGRAM_PREFIX. Remove
INSTALL_DIR #define when building setup.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1740
---
src/setup/Makefile.am | 3 +--
src/setup/setup-manifest.xml.in | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index 58561b62..07d7c936 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -3,8 +3,7 @@ gamesdir = $(prefix)/games
AM_CFLAGS = @SDL_CFLAGS@ \
@SDLMIXER_CFLAGS@ \
- -I$(top_builddir)/textscreen -I.. \
- -DINSTALL_DIR="\"$(gamesdir)\""
+ -I$(top_builddir)/textscreen -I..
noinst_LIBRARIES = libsetup.a
diff --git a/src/setup/setup-manifest.xml.in b/src/setup/setup-manifest.xml.in
index 70ae915e..bac9a05e 100644
--- a/src/setup/setup-manifest.xml.in
+++ b/src/setup/setup-manifest.xml.in
@@ -3,7 +3,7 @@
<!-- The "name" field in this tag should be the same as the executable's
name -->
<assemblyIdentity version="@PACKAGE_VERSION@.0" processorArchitecture="*"
- name="chocolate-setup" type="win32"/>
+ name="@PROGRAM_PREFIX@setup" type="win32"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>