fly/flightgear
1
0
Fork 0
Code Activity

Packaging fixes.

Browse source
This commit is contained in:
curt 1999-06-04 20:35:47 +00:00
parent 3bfd20a2b9
commit dc729fae17
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Simulator/Main/Makefile.am
View file

@ -27,6 +27,8 @@ else
SERIAL_LIBS = SERIAL_LIBS =
endif endif
DEFS += -DPKGLIBDIR=\"$(pkglibdir)\"
EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
bin_PROGRAMS = fgfs bin_PROGRAMS = fgfs

2
Simulator/Main/options.cxx
View file

@ -196,7 +196,7 @@ fgOPTIONS::fgOPTIONS() :
#elif defined( MACOS ) #elif defined( MACOS )
fg_root = ":"; fg_root = ":";
#else #else
fg_root = "/usr/local/lib/FlightGear"; fg_root = PKGLIBDIR;
#endif #endif
} }

18
acsite.m4
View file

@ -26,19 +26,19 @@ dnl
dnl dnl
dnl dnl
AC_DEFUN(wi_EXTRA_LDIR, [ AC_DEFUN(wi_EXTRA_LDIR, [
libdir="$1" mylibdir="$1"
if test -r $libdir ; then if test -r $mylibdir ; then
case "$LDFLAGS" in case "$LDFLAGS" in
*-L${libdir}*) *-L${mylibdir}*)
# echo " + already had $libdir" 1>&6 # echo " + already had $mylibdir" 1>&6
;; ;;
*) *)
if test "$LDFLAGS" = "" ; then if test "$LDFLAGS" = "" ; then
LDFLAGS="-L$libdir" LDFLAGS="-L$mylibdir"
else else
LDFLAGS="$LDFLAGS -L$libdir" LDFLAGS="$LDFLAGS -L$mylibdir"
fi fi
echo " + found $libdir" 1>&6 echo " + found $mylibdir" 1>&6
;; ;;
esac esac
fi fi
@ -99,8 +99,8 @@ for exdir in $exdirs ; do
incdir="${exdir}/include${subexdir}" incdir="${exdir}/include${subexdir}"
wi_EXTRA_IDIR($incdir) wi_EXTRA_IDIR($incdir)
libdir="${exdir}/lib${subexdir}" mylibdir="${exdir}/lib${subexdir}"
wi_EXTRA_LDIR($libdir) wi_EXTRA_LDIR($mylibdir)
progdir="${exdir}/bin${subexdirr}" progdir="${exdir}/bin${subexdirr}"
wi_EXTRA_PDIR($progdir) wi_EXTRA_PDIR($progdir)