ref: b8dfaffcb5bda84289b534b8252f0cc58e21a219
parent: 08ad5553fdec448b9c7955583a9728354e5ea4eb
author: Fabian Greffrath <[email protected]>
date: Mon Feb 3 01:34:14 EST 2014
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.
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,6 @@
AC_PROG_CC
AC_PROG_RANLIB
-AC_PROG_LN_S
AC_CHECK_PROG(HAVE_PYTHON, python, true, false)
OPT_LEVEL=2
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -50,7 +50,7 @@
$(hexendocs_DATA) $(strifedocs_DATA)
$(SETUP_MAN_PAGES): @[email protected]
- $(LN_S) $< $@
+ cp $< $@
@[email protected]: ../src $(MANPAGE_GEN_FILES)
./docgen -g doom -m doom.template ../src ../src/doom > $@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,14 +7,15 @@
@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)
AM_CFLAGS = -I$(top_builddir)/textscreen \
@@ -183,8 +184,8 @@
@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: