From b8dfaffcb5bda84289b534b8252f0cc58e21a219 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Mon, 3 Feb 2014 06:34:14 +0100 Subject: Revert the more controversial changes in my previous pull request. Add back to binaries that are built and installed as _SCRIPTS targets. Copy instead of symbolic linking, the files are needed as binary copies anyway to allow for separate packaging of the game engines. --- src/Makefile.am | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 0b831922..5c9d15f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,13 +7,14 @@ execgames_PROGRAMS = @PROGRAM_PREFIX@doom \ @PROGRAM_PREFIX@heretic \ @PROGRAM_PREFIX@hexen \ @PROGRAM_PREFIX@strife \ - @PROGRAM_PREFIX@server \ - @PROGRAM_PREFIX@setup + @PROGRAM_PREFIX@server -SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup \ - @PROGRAM_PREFIX@heretic-setup \ - @PROGRAM_PREFIX@hexen-setup \ - @PROGRAM_PREFIX@strife-setup +noinst_PROGRAMS = @PROGRAM_PREFIX@setup + +SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT) \ + @PROGRAM_PREFIX@heretic-setup$(EXEEXT) \ + @PROGRAM_PREFIX@hexen-setup$(EXEEXT) \ + @PROGRAM_PREFIX@strife-setup$(EXEEXT) execgames_SCRIPTS = $(SETUP_BINARIES) @@ -183,8 +184,8 @@ endif @PROGRAM_PREFIX@strife_LDADD = strife/libstrife.a $(EXTRA_LIBS) -$(SETUP_BINARIES): @PROGRAM_PREFIX@setup - $(LN_S) $< $@ +$(SETUP_BINARIES): @PROGRAM_PREFIX@setup$(EXEEXT) + cp $< $@ # Source files needed for chocolate-setup: -- cgit v1.2.3