diff options
| author | Simon Howard | 2011-05-14 20:11:26 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-05-14 20:11:26 +0000 |
| commit | 184ea9ba501adf04b9b352760774fde268c0cc7f (patch) | |
| tree | d1dd7d0b580327ad044a73fe833a81741abd77b3 /src | |
| parent | 87efdfbd570fe85141ec5e8b8f5814563fcf1d4f (diff) | |
| download | chocolate-doom-184ea9ba501adf04b9b352760774fde268c0cc7f.tar.gz chocolate-doom-184ea9ba501adf04b9b352760774fde268c0cc7f.tar.bz2 chocolate-doom-184ea9ba501adf04b9b352760774fde268c0cc7f.zip | |
Convert build system to using the PROGRAM_PREFIX system used on
raven-branch.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2336
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/doom-screensaver.desktop.in | 4 | ||||
| -rw-r--r-- | src/m_config.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 26fe7c7d..7a690cf1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ gamesdir = $(prefix)/games -games_PROGRAMS = chocolate-doom chocolate-server +games_PROGRAMS = @PROGRAM_PREFIX@doom @PROGRAM_PREFIX@server AM_CFLAGS = -I../opl -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ @@ -21,8 +21,8 @@ net_server.c net_server.h \ net_structrw.c net_structrw.h \ z_native.c z_zone.h -chocolate_server_SOURCES=$(DEDSERV_FILES) -chocolate_server_LDADD = ../wince/libc_wince.a @LDFLAGS@ @SDLNET_LIBS@ +@PROGRAM_PREFIX@server_SOURCES=$(DEDSERV_FILES) +@PROGRAM_PREFIX@server_LDADD = ../wince/libc_wince.a @LDFLAGS@ @SDLNET_LIBS@ MAIN_SOURCE_FILES=\ am_map.c am_map.h \ @@ -167,12 +167,12 @@ SOURCE_FILES = $(MAIN_SOURCE_FILES) \ $(FEATURE_SOUND_SOURCE_FILES) if HAVE_WINDRES -chocolate_doom_SOURCES=$(SOURCE_FILES) resource.rc +@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES) resource.rc else -chocolate_doom_SOURCES=$(SOURCE_FILES) +@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES) endif -chocolate_doom_LDADD = \ +@PROGRAM_PREFIX@doom_LDADD = \ ../wince/libc_wince.a \ ../textscreen/libtextscreen.a \ ../pcsound/libpcsound.a \ diff --git a/src/doom-screensaver.desktop.in b/src/doom-screensaver.desktop.in index cee79c2d..1d6e3303 100644 --- a/src/doom-screensaver.desktop.in +++ b/src/doom-screensaver.desktop.in @@ -3,8 +3,8 @@ Encoding=UTF-8 Name=Doom Comment=DOOM by Id Software. -TryExec=@PACKAGE_TARNAME@ -Exec=@PACKAGE_TARNAME@ +TryExec=@PACKAGE_PREFIX@doom +Exec=@PACKAGE_PREFIX@doom StartupNotify=false Terminal=false Type=Application diff --git a/src/m_config.c b/src/m_config.c index 04d0a963..d0fd5185 100644 --- a/src/m_config.c +++ b/src/m_config.c @@ -1452,9 +1452,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); |