*** ../run/getsts.orig	Tue Jan 14 13:21:06 1997
--- ../run/getsts	Sun Mar  2 00:52:30 1997
***************
*** 24,42 ****
  #
  set stsnum=81
  set prelaunch=0
! set ftphost=192.149.89.61
! set satdir=/home/manfred
! set satuser=manfred
  #
  #
  #
! set userid=$USER@`hostname`.`domainname`
  #
! if ($USER == $satuser) then
!     set satdirusr=$satdir
!     else
!     set satdirusr=$HOME
!     mkdir -p $HOME/SatTrack/tle
  endif
  #
  cd $satdirusr/SatTrack/tle
--- 24,45 ----
  #
  set stsnum=81
  set prelaunch=0
! set ftphost=spacelink.msfc.nasa.gov
! set satdir=/usr/local/lib
! set satuser=sattrack
  #
  #
  #
! set hostdot=`hostname | grep '\.'`
! if ("$hostdot" == "") then
!     set userid=$USER@`hostname`.`domainname`
! else
!     set userid=$USER@`hostname`
! endif
  #
! set satdirusr=$satdir
! if (! -d $satdirusr/SatTrack/tle) then
!     mkdir -p $satdirusr/SatTrack/tle
  endif
  #
  cd $satdirusr/SatTrack/tle
*** ../run/gettle.orig	Tue Mar 14 22:26:06 1995
--- ../run/gettle	Sun Mar  2 00:52:31 1997
***************
*** 24,41 ****
  #
  #
  #
! set ftphost=129.92.1.66
! set satdir=/home/manfred
! set satuser=manfred
  #
  #
  #
! set userid=$USER@`hostname`.`domainname`
  #
! if ($USER == $satuser) then 
!     set satdirusr=$satdir
!     else
!     set satdirusr=$HOME
      mkdir -p $satdirusr/SatTrack/tle
  endif
  #
--- 24,44 ----
  #
  #
  #
! set ftphost=archive.afit.af.mil
! set satdir=/usr/local/lib
! set satuser=sattrack
  #
  #
  #
! set hostdot=`hostname | grep '\.'`
! if ("$hostdot" == "") then
!     set userid=$USER@`hostname`.`domainname`
! else
!     set userid=$USER@`hostname`
! endif
  #
! set satdirusr=$satdir
! if (! -d $satdirusr/SatTrack/tle) then
      mkdir -p $satdirusr/SatTrack/tle
  endif
  #
*** ../src/Makefile.orig	Mon Jan 13 17:51:01 1997
--- ../src/Makefile	Sun Mar  2 00:52:30 1997
***************
*** 113,122 ****
  
  # Sun-4         (SPARCstation 5 or 10 with Solaris 2.x, using 'gcc' only)
  #
! CPU		= Sun-4/Solaris
! CC_CMACH	= -O3 -DSVR4 -Wall
! CC_LMACH	=
! CC		= gcc
  
  # Apollo 700    (HP Apollo 9000 Series 700 with HPUX)
  #
--- 113,122 ----
  
  # Sun-4         (SPARCstation 5 or 10 with Solaris 2.x, using 'gcc' only)
  #
! #CPU		= Sun-4/Solaris
! #CC_CMACH	= -O3 -DSVR4 -Wall
! #CC_LMACH	=
! #CC		= gcc
  
  # Apollo 700    (HP Apollo 9000 Series 700 with HPUX)
  #
***************
*** 183,192 ****
  
  # i386          (i386 with FreeBSD)
  #
! #CPU		= i386/FreeBSD
! #CC_CMACH	= -O -DFREEBSD -DIOCTL
! #CC_LMACH	=
! #CC		= gcc
  
  #
  #-------------------------------------------------------------------------------
--- 183,192 ----
  
  # i386          (i386 with FreeBSD)
  #
! CPU		= i386/FreeBSD
! CC_CMACH	= -DFREEBSD -DIOCTL ${CFLAGS}
! CC_LMACH	= ${LDFLAGS}
! CC		= gcc
  
  #
  #-------------------------------------------------------------------------------
***************
*** 228,234 ****
  #CC_CUSR	= -DREVERSEVIDEO -DXWINDOW
  #CC_CUSR	= -DHOMEDIR -DREVERSEVIDEO -DXWINDOW
  
! CC_CUSR		= -DHOMEDIR -DREVERSEVIDEO -DSUNTRANSITS -DXWINDOW 
  
  #
  #-------------------------------------------------------------------------------
--- 228,234 ----
  #CC_CUSR	= -DREVERSEVIDEO -DXWINDOW
  #CC_CUSR	= -DHOMEDIR -DREVERSEVIDEO -DXWINDOW
  
! CC_CUSR		= -DREVERSEVIDEO -DSUNTRANSITS -DXWINDOW 
  
  #
  #-------------------------------------------------------------------------------
***************
*** 245,251 ****
  # but should be accessible by other users as well.
  #
  
! #HOME		= /home/manfred
  
  #
  #-------------------------------------------------------------------------------
--- 245,252 ----
  # but should be accessible by other users as well.
  #
  
! HOME		= ../..
! CC_CUSR		+= -DSATDIR=\"$(PREFIX)/lib\"
  
  #
  #-------------------------------------------------------------------------------
***************
*** 253,261 ****
  # SATTRACK SUB-DIRECTORIES
  #
  
! SRC		= $(HOME)/SatTrack/src
! OBJ    		= $(HOME)/SatTrack/obj
! RUN     	= $(HOME)/SatTrack/run
  
  INC		= $(SRC)/include
  
--- 254,266 ----
  # SATTRACK SUB-DIRECTORIES
  #
  
! SRC		= $(HOME)/SatTrack-3.1.6/src
! OBJ    		= $(HOME)/SatTrack-3.1.6/obj
! RUN     	= $(HOME)/SatTrack-3.1.6/run
! DATA    	= $(HOME)/SatTrack-3.1.6/data
! PRED    	= $(HOME)/SatTrack-3.1.6/pred
! TLE     	= $(HOME)/SatTrack-3.1.6/tle
! DOC     	= $(HOME)/SatTrack-3.1.6/doc
  
  INC		= $(SRC)/include
  
***************
*** 318,330 ****
  #X11		= /usr/include
  #X11		= /usr/local/include
  #X11		= /usr/include/X11
! X11		= /usr/openwin/include
  
! LX11		= -lX11 -lXt                                           # X11R5
  #LX11		= -lXt -lX11 -lsocket                                  # SCOV5
  #LX11		= -L/usr/openwin/lib -lX11 -lXt
  
  #LX11		= -lX11 -lXt -lICE -lSM                                # X11R6
  #LX11		= -L/usr/openwin/lib -lX11 -lXt -lICE -lSM
  
  #CC_CXINC	=
--- 323,337 ----
  #X11		= /usr/include
  #X11		= /usr/local/include
  #X11		= /usr/include/X11
! #X11		= /usr/openwin/include
! X11		= $(X11BASE)/include
  
! #LX11		= -lX11 -lXt                                           # X11R5
  #LX11		= -lXt -lX11 -lsocket                                  # SCOV5
  #LX11		= -L/usr/openwin/lib -lX11 -lXt
  
  #LX11		= -lX11 -lXt -lICE -lSM                                # X11R6
+ LX11		= -L$(X11BASE)/lib -lX11 -lXt -lICE -lSM
  #LX11		= -L/usr/openwin/lib -lX11 -lXt -lICE -lSM
  
  #CC_CXINC	=
***************
*** 355,360 ****
--- 362,391 ----
  	cd $(RUN) ; \
  	/bin/rm -f fixchecksum makeamsat makepassesx maketles maketlex \
  	satfilter sattrack xdemo
+ 
+ install:
+ 	-@mkdir -p $(PREFIX)/lib/SatTrack/data
+ 	cd $(DATA) ; find . -print | cpio -pudm $(PREFIX)/lib/SatTrack/data
+ 	-@mkdir $(PREFIX)/lib/SatTrack/pred
+ 	cd $(PRED) ; find . -print | cpio -pudm $(PREFIX)/lib/SatTrack/pred
+ 	-@mkdir $(PREFIX)/lib/SatTrack/tle
+ 	cd $(TLE) ; find . -print | cpio -pudm $(PREFIX)/lib/SatTrack/tle
+ 	-@mkdir -p $(PREFIX)/share/doc/SatTrack
+ 	cd $(DOC) ; find . -print | cpio -pudm $(PREFIX)/share/doc/SatTrack
+ 	-@mkdir -p $(PREFIX)/bin
+ 	install -c -s -m 755 $(RUN)/fixchecksum $(PREFIX)/bin/fixchecksum
+ 	install -c -m 755 $(RUN)/getsts $(PREFIX)/bin/getsts
+ 	install -c -m 755 $(RUN)/gettle $(PREFIX)/bin/gettle
+ 	install -c -s -m 755 $(RUN)/makeamsat $(PREFIX)/bin/makeamsat
+ 	install -c -s -m 755 $(RUN)/makepassesx $(PREFIX)/bin/makepassesx
+ 	install -c -s -m 755 $(RUN)/maketles $(PREFIX)/bin/maketles
+ 	install -c -s -m 755 $(RUN)/maketlex $(PREFIX)/bin/maketlex
+ 	install -c -m 755 $(RUN)/passes $(PREFIX)/bin/passes
+ 	install -c -m 755 $(RUN)/passesx $(PREFIX)/bin/passesx
+ 	install -c -s -m 755 $(RUN)/satfilter $(PREFIX)/bin/satfilter
+ 	install -c -s -m 755 $(RUN)/sattrack $(PREFIX)/bin/sattrack
+ 	install -c -m 755 $(RUN)/transits $(PREFIX)/bin/transits
+ 	install -c -s -m 755 $(RUN)/xdemo $(PREFIX)/bin/xsattrackdemo
  
  #
  #-------------------------------------------------------------------------------
*** ../src/include/sattrack.h.orig	Tue Jan 14 09:38:38 1997
--- ../src/include/sattrack.h	Sun Mar  2 00:52:30 1997
***************
*** 74,86 ****
  /*                                                                            */
  /******************************************************************************/
  
! #define SATDIR                "/usr1/manfred"    /* directory where SatTrack  */
                                                   /* lives; used if HOMEDIR is */
                                                   /* undefined in the Makefile */
  
  #define DATA                  "SatTrack/data"    /* SatTrack sub-directories  */
  #define PRED                  "SatTrack/pred"
! #define RUN                   "SatTrack/run"
  #define TLE                   "SatTrack/tle"
  #define SRC                   "SatTrack/src"
  #define INC                   "SatTrack/src/include"
--- 74,88 ----
  /*                                                                            */
  /******************************************************************************/
  
! #ifndef SATDIR
! #define SATDIR                "/usr/local/lib"   /* directory where SatTrack  */
                                                   /* lives; used if HOMEDIR is */
                                                   /* undefined in the Makefile */
+ #endif
  
  #define DATA                  "SatTrack/data"    /* SatTrack sub-directories  */
  #define PRED                  "SatTrack/pred"
! #define RUN                   "../bin"
  #define TLE                   "SatTrack/tle"
  #define SRC                   "SatTrack/src"
  #define INC                   "SatTrack/src/include"
