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.
---
 configure.ac    |  1 -
 man/Makefile.am |  2 +-
 src/Makefile.am | 17 +++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0b8892a3..90c2752a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,6 @@ orig_CFLAGS="$CFLAGS"
 
 AC_PROG_CC
 AC_PROG_RANLIB
-AC_PROG_LN_S
 AC_CHECK_PROG(HAVE_PYTHON, python, true, false)
 
 OPT_LEVEL=2
diff --git a/man/Makefile.am b/man/Makefile.am
index 0eb585e0..15bba637 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -50,7 +50,7 @@ CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \
              $(hexendocs_DATA) $(strifedocs_DATA)
 
 $(SETUP_MAN_PAGES): @PROGRAM_PREFIX@setup.6
-	$(LN_S) $< $@
+	cp $< $@
 
 @PROGRAM_PREFIX@doom.6: ../src $(MANPAGE_GEN_FILES)
 	./docgen -g doom -m doom.template ../src ../src/doom > $@
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