From d732762a761cc5adb87e8704a5f1549f38cdea0f Mon Sep 17 00:00:00 2001
From: Julie Marchant <onpon4@riseup.net>
Date: Sat, 6 Jul 2019 21:17:41 -0400
Subject: [PATCH 1/5] Imported a fix of configure.ac.

---
 configure.ac      |  2 ++
 music/Makefile.am | 11 -----------
 sound/Makefile.am | 11 -----------
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 music/Makefile.am
 delete mode 100644 sound/Makefile.am

diff --git a/configure.ac b/configure.ac
index 03213fd..fb69ef5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,8 @@ AC_PROG_INSTALL
 STARFIGHTER_CFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\""
 
 # Checks for libraries.
+AC_SEARCH_LIBS([atanf], [m])
+
 PKG_CHECK_EXISTS([SDL2_mixer], [
 	PKG_CHECK_EXISTS([SDL2_ttf], [
 		PKG_CHECK_MODULES([SDL], [sdl2 SDL2_image SDL2_mixer SDL2_ttf])
diff --git a/music/Makefile.am b/music/Makefile.am
deleted file mode 100644
index d4a568a..0000000
--- a/music/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file has been dedicated to the public domain, to the extent
-# possible under applicable law, via CC0. See
-# http://creativecommons.org/publicdomain/zero/1.0/ for more
-# information. This file is offered as-is, without any warranty.
-
-if !RUN_IN_PLACE
-
-nobase_pkgdata_DATA = *
-
-endif
-
diff --git a/sound/Makefile.am b/sound/Makefile.am
deleted file mode 100644
index d4a568a..0000000
--- a/sound/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file has been dedicated to the public domain, to the extent
-# possible under applicable law, via CC0. See
-# http://creativecommons.org/publicdomain/zero/1.0/ for more
-# information. This file is offered as-is, without any warranty.
-
-if !RUN_IN_PLACE
-
-nobase_pkgdata_DATA = *
-
-endif
-

From 00512c44906a26a37ad6501eb049c38323586d60 Mon Sep 17 00:00:00 2001
From: Julie Marchant <onpon4@riseup.net>
Date: Sat, 6 Jul 2019 21:24:45 -0400
Subject: [PATCH 2/5] Removed unnecessary part

---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 6541fd2..0ad7b60 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ else
 starfighter_CPPFLAGS = $(STARFIGHTER_CFLAGS) -DDATADIR=\"$(pkgdatadir)\" -Wall
 endif
 
-starfighter_CFLAGS = $(SDL_CFLAGS) $(PANGO_CFLAGS) -lm
+starfighter_CFLAGS = $(SDL_CFLAGS) $(PANGO_CFLAGS)
 starfighter_LDADD = $(SDL_LIBS) $(PANGO_LIBS)
 
 starfighter_SOURCES = \

From f325ea9c204187cf75455ba7259fcd48e7f4b456 Mon Sep 17 00:00:00 2001
From: Julie Marchant <onpon4@riseup.net>
Date: Sun, 7 Jul 2019 14:47:57 -0400
Subject: [PATCH 3/5] 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])
 

From f2be64825fba38ef45aad493afdc5a3b6a1c37de Mon Sep 17 00:00:00 2001
From: Julie Marchant <onpon4@riseup.net>
Date: Sun, 7 Jul 2019 15:44:52 -0400
Subject: [PATCH 4/5] Removed the unnecessary conditional in Makefile.am.

No new release this time (it doesn't break anything important), but
this is a pointless conditional.
---
 Makefile.am | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a9a2811..a8e18ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,6 @@
 SUBDIRS = src misc
 
 dist_doc_DATA = README.txt COPYING LICENSES
-
-if !RUN_IN_PLACE
-
 nobase_dist_pkgdata_DATA = data/* gfx/* music/* sound/* locale/*
-
-endif
-
 EXTRA_DIST = starfighter.sh win32build.sh
 

From 1575dc8625e2fcfd11bf18a0cb182d6415d05ba7 Mon Sep 17 00:00:00 2001
From: Julie Marchant <onpon4@riseup.net>
Date: Sat, 20 Jul 2019 22:02:23 -0400
Subject: [PATCH 5/5] Fixed failure to include misc directory in dists.

---
 Makefile.am      | 2 +-
 misc/Makefile.am | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a8e18ed..855b05e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,5 +7,5 @@ SUBDIRS = src misc
 
 dist_doc_DATA = README.txt COPYING LICENSES
 nobase_dist_pkgdata_DATA = data/* gfx/* music/* sound/* locale/*
-EXTRA_DIST = starfighter.sh win32build.sh
+EXTRA_DIST = starfighter.sh win32build.sh misc
 
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 5bc2adb..af7a799 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -3,12 +3,9 @@
 # http://creativecommons.org/publicdomain/zero/1.0/ for more
 # information. This file is offered as-is, without any warranty.
 
-if !RUN_IN_PLACE
-
 desktopdir = $(datarootdir)/applications
 desktop_DATA = starfighter.desktop
 
 icondir = $(datarootdir)/pixmaps
 icon_DATA = starfighter.png
 
-endif