From ddac22a965717f6812ef498f14b881fa6cbee57e Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 17 Dec 1997 23:13:17 +0000
Subject: [PATCH] Changes and tweaks to go to version 0.19 (Plus tweaks to
 Solaris support)

---
 Simulator/Makefile | 12 ++++++++----
 Simulator/make.inc | 13 ++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Simulator/Makefile b/Simulator/Makefile
index f07b102e3..da1b08d68 100644
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -61,17 +61,17 @@ clean:
 
 source-tar: clean
 	(cd ../..; \
-	tar cvzf source-$(FG_VERSION).tar.gz FlightGear/fgtop \
+	$(TAR) cvzf source-$(FG_VERSION).tar.gz FlightGear/fgtop \
 	FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
 
 source-zip: clean
 	(cd ../..; \
-	zip -r source-$(FG_VERSION).zip FlightGear/fgtop 
+	zip -r source-$(FG_VERSION).zip FlightGear/fgtop \
 	FlightGear/COPYING FlightGear/Docs FlightGear/Src FlightGear/Thanks)
 
 scenery-tar:
 	(cd ../..; \
-	tar cvzf scenery-$(FG_VERSION).tar.gz FlightGear/Scenery)
+	$(TAR) cvzf scenery-$(FG_VERSION).tar.gz FlightGear/Scenery)
 
 scenery-zip:
 	(cd ../..; \
@@ -79,9 +79,10 @@ scenery-zip:
 
 bin-tar: all
 	cp Main/fg-$(FG_VERSION) runfg ..
+	$(RM) -f ../fg$(FG_VERSION_MAJOR)
 	$(LN) ../fg-$(FG_VERSION) ../fg$(FG_VERSION_MAJOR)
 	(cd ../..; \
-	tar cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop \
+	$(TAR) cvzf bin-$(FG_VERSION).tar.gz FlightGear/fgtop \
 	FlightGear/fg-$(FG_VERSION) FlightGear/fg$(FG_VERSION_MAJOR) \
 	FlightGear/runfg FlightGear/COPYING FlightGear/Docs FlightGear/Thanks)
 
@@ -96,6 +97,9 @@ bin-zip:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.33  1997/12/17 23:13:17  curt
+# Changes and tweaks to go to version 0.19 (Plus tweaks to Solaris support)
+#
 # Revision 1.32  1997/12/15 23:54:25  curt
 # Add xgl wrappers for debugging.
 # Generate terrain normals on the fly.
diff --git a/Simulator/make.inc b/Simulator/make.inc
index 78c22c80b..645921862 100644
--- a/Simulator/make.inc
+++ b/Simulator/make.inc
@@ -30,7 +30,7 @@
 #---------------------------------------------------------------------------
 
 FG_VERSION_MAJOR = 0
-FG_VERSION_MINOR = 18
+FG_VERSION_MINOR = 19
 FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
 
 
@@ -43,7 +43,9 @@ FLEX = flex -f -L
 BISON = bison -v --no-lines
 AR = ar
 RANLIB = ranlib
+RM = rm
 LN = ln -sf
+TAR = tar
 
 
 #---------------------------------------------------------------------------
@@ -128,6 +130,7 @@ FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11
 # FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
+# TAR = gtar
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
@@ -137,8 +140,9 @@ FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 # INTERFACE_FLAGS = -DGLUT
 # INTERFACE_LIBS = -lglut
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
-# GRAPHICS_LIBS =  -lGLU -lGL -lXext -lXmu -lXi -lX11
+# GRAPHICS_LIBS =  -L/opt/X11R6/lib -lGLU -lGL -lXext -lXmu -lXi -lX11 -lsocket
 # FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
+# TAR = gtar
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
@@ -149,12 +153,15 @@ FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS)
 # INTERFACE_FILES = GLUTmain.c GLUTkey.c
 # GRAPHICS_LIBS = -lglu32 -lopengl32 -luser32 -lgdi32
 # FG_CFLAGS = $(GLOBAL_CFLAGS) $(FG_DEBUG_FLAGS) -DWIN32 -DUSE_RAND
-# LN = copy
+# LN = ren
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.26  1997/12/17 23:13:18  curt
+# Changes and tweaks to go to version 0.19 (Plus tweaks to Solaris support)
+#
 # Revision 1.25  1997/12/15 23:54:26  curt
 # Add xgl wrappers for debugging.
 # Generate terrain normals on the fly.