Packaging fixes.

diff --git a/Simulator/Main/Makefile.am b/Simulator/Main/Makefile.am
index 760021244e169625f7a0e027bb93a08c766eb7ed..58d5d55e8f16452836bad84a5f86ebefde5642ba 100644 (file)
--- 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 5df50ddda9cc6a2a62b351810d36ba6f66c096f5..b7735a9e8c07afa0a88d2e3eacff30a6792136b2 100644 (file)
--- 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 6a845b801a14a35f878f65fb34510637e01fe45d..3a0e116ea4d8d9dba0656cc3c276dcc9697c1f54 100644 (file)
--- 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)