From f325ea9c204187cf75455ba7259fcd48e7f4b456 Mon Sep 17 00:00:00 2001 From: Julie Marchant Date: Sun, 7 Jul 2019 14:47:57 -0400 Subject: [PATCH] Fixed make install --- Makefile.am | 5 +++-- configure.ac | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 53877c4..a9a2811 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,11 +6,12 @@ SUBDIRS = src misc dist_doc_DATA = README.txt COPYING LICENSES -EXTRA_DIST = starfighter.sh win32build.sh data gfx music sound locale misc if !RUN_IN_PLACE -nobase_pkgdata_DATA = data/* gfx/* music/* sound/* locale/* +nobase_dist_pkgdata_DATA = data/* gfx/* music/* sound/* locale/* endif +EXTRA_DIST = starfighter.sh win32build.sh + diff --git a/configure.ac b/configure.ac index fb69ef5..a6bb196 100644 --- a/configure.ac +++ b/configure.ac @@ -67,7 +67,7 @@ AS_IF([test -n "$SF_RUN_IN_PLACE"], [ echo "Preparing a run-in-place build" ]) -AM_CONDITIONAL([RUN_IN_PLACE], [test "$SF_RUN_IN_PLACE = 1"]) +AM_CONDITIONAL([RUN_IN_PLACE], [test -n "$SF_RUN_IN_PLACE"]) AC_SUBST([STARFIGHTER_CFLAGS])