Directory reshuffling.

diff --git a/Main/Makefile.am b/Main/Makefile.am
index fa00d0d1881ebd065035eeb5c9dfd3955f3e5839..9fed7728aff10d20ffee48bb949a61866ad0b1f4 100644 (file)
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -43,6 +43,7 @@ fgfs_LDADD = \
        $(top_builddir)/Simulator/Flight/Slew/libSlew.a \
        $(top_builddir)/Simulator/GUI/libGUI.a \
        $(top_builddir)/Simulator/Scenery/libScenery.a \
+       $(top_builddir)/Simulator/Objects/libObjects.a \
        $(top_builddir)/Simulator/Time/libTime.a \
        $(top_builddir)/Simulator/Weather/libWeather.a \
         $(top_builddir)/Simulator/Joystick/libJoystick.a \

diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx
index 3a1726fbc80a203c8ed7932bf830433605bfdb5f..4d0d848582e33edb346310b2d08fd966f63be1c4 100644 (file)
--- a/Main/fg_init.cxx
+++ b/Main/fg_init.cxx
@@ -43,6 +43,7 @@
 #include <Include/general.h>
 
 #include <Aircraft/aircraft.h>
+#include <Airports/simple.hxx>
 #include <Astro/moon.hxx>
 #include <Astro/planets.hxx>
 #include <Astro/sky.hxx>
@@ -63,7 +64,6 @@
 #include <Time/sunpos.hxx>
 #include <Weather/weather.h>
 
-#include "airports.hxx"
 #include "fg_init.hxx"
 #include "options.hxx"
 #include "views.hxx"
@@ -388,7 +388,10 @@ int fgInitSubsystems( void ) {
 
 
 // $Log$
-// Revision 1.31  1998/08/22 14:49:57  curt
+// Revision 1.32  1998/08/25 16:59:09  curt
+// Directory reshuffling.
+//
+// Revision 1.31  1998/08/22  14:49:57  curt
 // Attempting to iron out seg faults and crashes.
 // Did some shuffling to fix a initialization order problem between view
 // position, scenery elevation.

diff --git a/Main/runfgfs.in b/Main/runfgfs.in
index 92974eb0daf6f65f90474210f22e85fdca463e71..6787f01793d16eb7d9a31c39f1e7d59147a76580 100755 (executable)
--- a/Main/runfgfs.in
+++ b/Main/runfgfs.in
@@ -64,7 +64,7 @@ die "Cannot locate program.\n" if ( $savepath eq "" );
 
 
 # search for the "FlightGear" root directory
-@paths = ( $saveprefix, $ENV{HOME} );
+@paths = ( $prefix, $saveprefix, $ENV{HOME} );
 
 $fg_root = "";
 
@@ -89,6 +89,9 @@ exec("$savepath/$savefile --fg-root=$fg_root @ARGV");
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.2  1998/08/25 16:59:10  curt
+# Directory reshuffling.
+#
 # Revision 1.1  1998/08/24 20:32:41  curt
 # runfg.in renamed to runfgfs.in
 #

diff --git a/Main/splash.cxx b/Main/splash.cxx
index c295997faf0ca6977fdebf5e7a77883e6dead7d8..4e95fc9415df6f132cf3f0630323c3ae8243a849 100644 (file)
--- a/Main/splash.cxx
+++ b/Main/splash.cxx
@@ -39,7 +39,7 @@
 #include <Aircraft/aircraft.h>
 #include <Debug/fg_debug.h>
 #include <Main/options.hxx>
-#include <Scenery/texload.h>
+#include <Objects/texload.h>
 
 #include "splash.hxx"
 
@@ -143,6 +143,9 @@ void fgSplashUpdate ( double progress ) {
 
 
 // $Log$
+// Revision 1.3  1998/08/25 16:59:10  curt
+// Directory reshuffling.
+//
 // Revision 1.2  1998/07/13 21:01:40  curt
 // Wrote access functions for current fgOPTIONS.
 //