diff --git a/Makefile.am b/Makefile.am
index 53877c4..855b05e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,6 @@
 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/*
-
-endif
+nobase_dist_pkgdata_DATA = data/* gfx/* music/* sound/* locale/*
+EXTRA_DIST = starfighter.sh win32build.sh misc
 
diff --git a/configure.ac b/configure.ac
index 03213fd..a6bb196 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])
@@ -65,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])
 
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
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
-
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 = \