From 42f6a7b10062ba6db7b5177dbe26a3738969de9a Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 22 Aug 2002 02:24:01 +0000
Subject: [PATCH] let mission files get installed by make

---
 Makefile.am  | 8 ++++++--
 configure.ac | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d1175d8d..63fe7c6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,10 +47,14 @@ changelog::
 	cd $(srcdir) && tools/cvs2cl/cvs2cl.pl -b --utc --accum
 #	rm -f $(srcdir)/ChangeLog.bak
 
+pkgdatadir = @sharepath@
+missiondir = ${pkgdatadir}/missions
+
+dist_mission_DATA = descent.msn d2demo.mn2
+
 EXTRA_DIST = ${EXTRA_SUBDIRS} \
 ChangeLog \
 djgpp.bat djgpp.sh \
 autogen.sh cygconf \
 cvshowto.txt readme.txt installation.txt mingw32.txt compilerdefs.txt \
-d2x-sdl.sh d2x-gl.sh \
-descent.msn d2demo.mn2
+d2x-sdl.sh d2x-gl.sh
diff --git a/configure.ac b/configure.ac
index bfc5083c..dab505f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,8 +73,7 @@ test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
 test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"
 
 dnl Set default locations to find data files.
-eval foo="$datadir"
-default_sharepath="$foo/games/$PACKAGE"
+default_sharepath="$datadir/games/$PACKAGE"
 
 CFLAGS="-Wall $CFLAGS"
 
@@ -135,6 +134,8 @@ AC_ARG_WITH(sharepath,
 if test "x$sharepath" = "xauto" -o "x$sharepath" = "xyes" -o "x$sharepath" = "x"; then
     sharepath="$default_sharepath"
 fi
+AC_SUBST(sharepath)
+eval sharepath=$sharepath
 AC_DEFINE_UNQUOTED(SHAREPATH, "$sharepath",[Define this to be the shared game directory root])
 
 # Test for MSDOS
-- 
2.39.2