From dc729fae17dffb06bb0955ceed3504eb7a6a69e7 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 4 Jun 1999 20:35:47 +0000
Subject: [PATCH] Packaging fixes.

---
 Simulator/Main/Makefile.am |  2 ++
 Simulator/Main/options.cxx |  2 +-
 acsite.m4                  | 18 +++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Simulator/Main/Makefile.am b/Simulator/Main/Makefile.am
index 760021244..58d5d55e8 100644
--- a/Simulator/Main/Makefile.am
+++ b/Simulator/Main/Makefile.am
@@ -27,6 +27,8 @@ else
 SERIAL_LIBS =
 endif
 
+DEFS += -DPKGLIBDIR=\"$(pkglibdir)\"
+
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
diff --git a/Simulator/Main/options.cxx b/Simulator/Main/options.cxx
index 5df50ddda..b7735a9e8 100644
--- a/Simulator/Main/options.cxx
+++ b/Simulator/Main/options.cxx
@@ -196,7 +196,7 @@ fgOPTIONS::fgOPTIONS() :
 #elif defined( MACOS )
 	fg_root = ":";
 #else
-	fg_root = "/usr/local/lib/FlightGear";
+	fg_root = PKGLIBDIR;
 #endif
     }
 
diff --git a/acsite.m4 b/acsite.m4
index 6a845b801..3a0e116ea 100644
--- a/acsite.m4
+++ b/acsite.m4
@@ -26,19 +26,19 @@ dnl
 dnl
 dnl
 AC_DEFUN(wi_EXTRA_LDIR, [
-libdir="$1"
-if test -r $libdir ; then
+mylibdir="$1"
+if test -r $mylibdir ; then
 	case "$LDFLAGS" in
-		*-L${libdir}*)
-			# echo "   + already had $libdir" 1>&6
+		*-L${mylibdir}*)
+			# echo "   + already had $mylibdir" 1>&6
 			;;
 		*)
 			if test "$LDFLAGS" = "" ; then
-				LDFLAGS="-L$libdir"
+				LDFLAGS="-L$mylibdir"
 			else
-				LDFLAGS="$LDFLAGS -L$libdir"
+				LDFLAGS="$LDFLAGS -L$mylibdir"
 			fi
-			echo "   + found $libdir" 1>&6
+			echo "   + found $mylibdir" 1>&6
 			;;
 	esac
 fi
@@ -99,8 +99,8 @@ for exdir in $exdirs ; do
 		incdir="${exdir}/include${subexdir}"
 		wi_EXTRA_IDIR($incdir)
 
-		libdir="${exdir}/lib${subexdir}"
-		wi_EXTRA_LDIR($libdir)
+		mylibdir="${exdir}/lib${subexdir}"
+		wi_EXTRA_LDIR($mylibdir)
 
 		progdir="${exdir}/bin${subexdirr}"
 		wi_EXTRA_PDIR($progdir)