diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/Makefile.am | 11 | ||||
| -rw-r--r-- | setup/configfile.c | 6 | ||||
| -rw-r--r-- | setup/setup-manifest.xml.in (renamed from setup/setup-manifest.xml) | 2 |
3 files changed, 9 insertions, 10 deletions
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.in index c2788306..ff879263 100644 --- a/setup/setup-manifest.xml +++ b/setup/setup-manifest.xml.in @@ -12,7 +12,7 @@ <!-- 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"/> + name="@PROGRAM_PREFIX@setup.exe" type="win32"/> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <security> <requestedPrivileges> |