ref: d0f41d4163fc96168f56155e6f5b36025eea79e4
parent: 372ad50b2260e5e03c251ae8442a65bd32334cf6
author: Simon Howard <fraggle@gmail.com>
date: Sat Nov 21 12:07:37 EST 2009
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
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -3,8 +3,7 @@
AM_CFLAGS = @SDL_CFLAGS@ \
@SDLMIXER_CFLAGS@ \
- -I$(top_builddir)/textscreen -I.. \
- -DINSTALL_DIR="\"$(gamesdir)\""
+ -I$(top_builddir)/textscreen -I..
noinst_LIBRARIES = libsetup.a
--- 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>