General cleanup. Purge fixed paths.

9 files changed, 88 insertions, 56 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 981689b..9f94a0c 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -19,14 +19,15 @@ EXTRA_DIST = \
 			calfuse.sh \
 			calfuse.wavecal \
 			cf_make_900_obs.csh \
-			cf_make_all.csh \
+			cf_make_all.csh.in \
 			cf_make_all_obs.csh \
 			idl_obsplot.pl \
 			idlplot_rate.pl \
 			idlplot_spex.pl
 
 CLEANFILES = cfsetup.csh \
-			 cfsetup.sh
+			 cfsetup.sh \
+			 cf_make_all.csh
 
 do_subst = sed -e 's,[@]DATADIR[@],$(pkgdatadir)-$(VERSION),g' \
 		   -e 's,[@]PREFIX[@],$(prefix),g' \
@@ -39,3 +40,7 @@ cfsetup.csh: cfsetup.csh.in Makefile
 cfsetup.sh: cfsetup.sh.in Makefile
 	$(do_subst) < cfsetup.sh.in > cfsetup.sh
 	chmod +x cfsetup.sh
+
+cf_make_all.csh: cf_make_all.csh.in Makefile
+	$(do_subst) < cf_make_all.csh.in > cf_make_all.csh
+	chmod +x cf_make_all.csh
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index b1a79bf..4dc5d3f 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -357,14 +357,15 @@ EXTRA_DIST = \
 			calfuse.sh \
 			calfuse.wavecal \
 			cf_make_900_obs.csh \
-			cf_make_all.csh \
+			cf_make_all.csh.in \
 			cf_make_all_obs.csh \
 			idl_obsplot.pl \
 			idlplot_rate.pl \
 			idlplot_spex.pl
 
 CLEANFILES = cfsetup.csh \
-			 cfsetup.sh
+			 cfsetup.sh \
+			 cf_make_all.csh
 
 do_subst = sed -e 's,[@]DATADIR[@],$(pkgdatadir)-$(VERSION),g' \
 		   -e 's,[@]PREFIX[@],$(prefix),g' \
@@ -730,6 +731,10 @@ cfsetup.sh: cfsetup.sh.in Makefile
 	$(do_subst) < cfsetup.sh.in > cfsetup.sh
 	chmod +x cfsetup.sh
 
+cf_make_all.csh: cf_make_all.csh.in Makefile
+	$(do_subst) < cf_make_all.csh.in > cf_make_all.csh
+	chmod +x cf_make_all.csh
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/scripts/calfuse.wavecal b/scripts/calfuse.wavecal
index fc00c54..552efda 100755
--- a/scripts/calfuse.wavecal
+++ b/scripts/calfuse.wavecal
@@ -63,10 +63,10 @@ set ttag    = `echo $froot | grep -c ttag`
 
 # Put a time stamp in the log file (the OPUS trailer file).
 if $ttag then
-    echo `date '+%Y %b %e %T'` "calfuse.wavecal-1.15: Begin  TTAG file $1"
+    echo `date '+%Y %b %e %T'` "calfuse.wavecal-1.15: Begin TTAG file $1"
     echo `date '+%Y %b %e %T'` "calfuse.wavecal-1.15: Begin TTAG file $1" >>& $logfile
 else
-    echo `date '+%Y %b %e %T'` "calfuse.wavecal-1.15: Begin  HIST file $1"
+    echo `date '+%Y %b %e %T'` "calfuse.wavecal-1.15: Begin HIST file $1"
     echo `date '+%Y %b %e %T'` "calfuse.wavecal-1.15: Begin HIST file $1" >>& $logfile
 endif
 
diff --git a/scripts/cf_make_all.csh b/scripts/cf_make_all.csh.in
index b63fde0..25abc93 100755
--- a/scripts/cf_make_all.csh
+++ b/scripts/cf_make_all.csh.in
@@ -54,7 +54,7 @@ set modhead = modhead
 #set cf_nvo = /home/vela/civeit/Work/CalFuse/Nvo/cf_nvo
 #set modhead = /home/vela/civeit/local/bin/modhead
 
-set cf_obsplot = /data1/fuse/calfuse/v3.1/idl/cf_obsplot.pro
+set cf_obsplot = @DATADIR@/idl/cf_obsplot.pro
 
 
 # Init var list
diff --git a/scripts/cfsetup.csh.in b/scripts/cfsetup.csh.in
index 69dc3df..c31a8c1 100644
--- a/scripts/cfsetup.csh.in
+++ b/scripts/cfsetup.csh.in
@@ -6,4 +6,4 @@ setenv PATH "${CF_DIR}/bin:${PATH}"
 setenv CF_CALDIR "@DATADIR@/calfiles"
 setenv CF_PARMDIR "@DATADIR@/parmfiles"
 setenv CF_IDLDIR "@DATADIR@/idl"
-
+setenv CF_HISTDIR `pwd`
diff --git a/src/cal/get_tle/GetTLE.class.in b/src/cal/get_tle/GetTLE.class.in
deleted file mode 100644
index 6d32037..0000000
--- a/src/cal/get_tle/GetTLE.class.in
+++ /dev/null
diff --git a/src/cal/get_tle/GetTLE.java.in b/src/cal/get_tle/GetTLE.java.in
index 68e88d3..1f814f0 100644
--- a/src/cal/get_tle/GetTLE.java.in
+++ b/src/cal/get_tle/GetTLE.java.in
@@ -28,8 +28,9 @@ public class GetTLE {
     static final String username="mromelfanger";
     static final String password="FuseJHU1";
   
-    static final String outputFile = "/data1/fuse/calfuse/caltemp/five.tle";
-    static final String logFile = "/data1/fuse/calfuse/caltemp/get_tle.logfile";
+    static final String curdir = System.getProperty("user.dir");
+    static final String outputFile = curdir + "/five.tle";
+    static final String logFile = curdir + "/get_tle.logfile";
 /*
     static final String outputFile = "/caltemp/five.tle";
     static final String logFile = "/caltemp/get_tle.logfile";
diff --git a/src/cal/get_tle/Makefile.am b/src/cal/get_tle/Makefile.am
index a2a12ee..fb50fae 100644
--- a/src/cal/get_tle/Makefile.am
+++ b/src/cal/get_tle/Makefile.am
@@ -1,3 +1,7 @@
+DATADIR = $(pkgdatadir)-$(VERSION)
+javadir = $(DATADIR)/java
+JAVAROOT = $(builddir)
+
 bin_SCRIPTS = \
 	add_tle.pl \
 	check_tle.pl \
@@ -8,12 +12,9 @@ bin_SCRIPTS = \
 	test_get_tle.pl \
 	update_tle.csh
 
-noinst_SCRIPTS = \
-	GetTLE.class \
-	GetTLE.java
+java_JAVA = GetTLE.java
 
 EXTRA_DIST = \
-	GetTLE.class.in \
 	GetTLE.java.in \
 	add_tle.pl.in \
 	check_tle.pl.in \
@@ -36,14 +37,10 @@ CLEANFILES = \
 	test_get_tle.pl \
 	update_tle.csh
 
-do_subst = sed -e 's,[@]DATADIR[@],$(pkgdatadir)-$(VERSION),g' \
+do_subst = sed -e 's,[@]DATADIR[@],$(DATADIR),g' \
 		   		   -e 's,[@]PREFIX[@],$(prefix),g' \
 				   -e 's,[@]VERSION[@],$(VERSION),g'
 
-GetTLE.class: GetTLE.class.in Makefile
-	$(do_subst) < GetTLE.class.in > GetTLE.class
-		chmod 644 GetTLE.class
-
 GetTLE.java: GetTLE.java.in Makefile
 	$(do_subst) < GetTLE.java.in > GetTLE.java
 		chmod 644 GetTLE.java
@@ -80,7 +77,5 @@ update_tle.csh: update_tle.csh.in Makefile
 	$(do_subst) < update_tle.csh.in > update_tle.csh
 		chmod +x update_tle.csh
 
-install-data-local: GetTLE.class GetTLE.java
-	mkdir -p $(DESTDIR)$(pkgdatadir)-$(VERSION)/java
-	install -D -m 644 GetTLE.class $(DESTDIR)$(pkgdatadir)-$(VERSION)/java
-	install -D -m 644 GetTLE.java $(DESTDIR)$(pkgdatadir)-$(VERSION)/java
+install-data-local:
+	$(INSTALL) -D -m 644 GetTLE.class $(DESTDIR)$(pkgdatadir)-$(VERSION)/java
diff --git a/src/cal/get_tle/Makefile.in b/src/cal/get_tle/Makefile.in
index 4b2a155..9e2aee8 100644
--- a/src/cal/get_tle/Makefile.in
+++ b/src/cal/get_tle/Makefile.in
@@ -128,8 +128,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(bindir)"
-SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(javadir)"
+SCRIPTS = $(bin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -149,6 +149,9 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+JAVAC = javac
+CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT)$${CLASSPATH:+":$$CLASSPATH"}
+am__java_sources = $(java_JAVA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -276,6 +279,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+DATADIR = $(pkgdatadir)-$(VERSION)
+javadir = $(DATADIR)/java
+JAVAROOT = $(builddir)
 bin_SCRIPTS = \
 	add_tle.pl \
 	check_tle.pl \
@@ -286,12 +292,8 @@ bin_SCRIPTS = \
 	test_get_tle.pl \
 	update_tle.csh
 
-noinst_SCRIPTS = \
-	GetTLE.class \
-	GetTLE.java
-
+java_JAVA = GetTLE.java
 EXTRA_DIST = \
-	GetTLE.class.in \
 	GetTLE.java.in \
 	add_tle.pl.in \
 	check_tle.pl.in \
@@ -314,7 +316,7 @@ CLEANFILES = \
 	test_get_tle.pl \
 	update_tle.csh
 
-do_subst = sed -e 's,[@]DATADIR[@],$(pkgdatadir)-$(VERSION),g' \
+do_subst = sed -e 's,[@]DATADIR[@],$(DATADIR),g' \
 		   		   -e 's,[@]PREFIX[@],$(prefix),g' \
 				   -e 's,[@]VERSION[@],$(VERSION),g'
 
@@ -391,6 +393,35 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+classjava.stamp: $(am__java_sources)
+	@list1='$?'; list2=; if test -n "$$list1"; then \
+	  for p in $$list1; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    list2="$$list2 $$d$$p"; \
+	  done; \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) '"$$list2"; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $$list2; \
+	else :; fi
+	echo timestamp > $@
+install-javaJAVA: classjava.stamp
+	@$(NORMAL_INSTALL)
+	@test -n "$(java_JAVA)" && test -n "$(javadir)" || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(javadir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(javadir)"; \
+	set x *.class; shift; test "$$1" != "*.class" || exit 0; \
+	echo " $(INSTALL_DATA)" "$$@" "'$(DESTDIR)$(javadir)/$$p'"; \
+	$(INSTALL_DATA) "$$@" "$(DESTDIR)$(javadir)"
+
+uninstall-javaJAVA:
+	@$(NORMAL_UNINSTALL)
+	@test -n "$(java_JAVA)" && test -n "$(javadir)" || exit 0; \
+	set x *.class; shift; test "$$1" != "*.class" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(javadir)' && rm -f" "$$@" ")"; \
+	cd "$(DESTDIR)$(javadir)" && rm -f "$$@"
+
+clean-javaJAVA:
+	-rm -f *.class classjava.stamp
 tags TAGS:
 
 ctags CTAGS:
@@ -430,9 +461,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(SCRIPTS)
+all-am: Makefile $(SCRIPTS) classjava.stamp
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(javadir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -468,7 +499,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-javaJAVA clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -486,7 +517,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-data-local install-javaJAVA
 
 install-dvi: install-dvi-am
 
@@ -530,30 +561,27 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS
+uninstall-am: uninstall-binSCRIPTS uninstall-javaJAVA
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binSCRIPTS install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-binSCRIPTS
+.PHONY: all all-am check check-am clean clean-generic clean-javaJAVA \
+	clean-libtool cscopelist-am ctags-am distclean \
+	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binSCRIPTS \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-javaJAVA \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-javaJAVA
 
 .PRECIOUS: Makefile
 
 
-GetTLE.class: GetTLE.class.in Makefile
-	$(do_subst) < GetTLE.class.in > GetTLE.class
-		chmod 644 GetTLE.class
-
 GetTLE.java: GetTLE.java.in Makefile
 	$(do_subst) < GetTLE.java.in > GetTLE.java
 		chmod 644 GetTLE.java
@@ -590,10 +618,8 @@ update_tle.csh: update_tle.csh.in Makefile
 	$(do_subst) < update_tle.csh.in > update_tle.csh
 		chmod +x update_tle.csh
 
-install-data-local: GetTLE.class GetTLE.java
-	mkdir -p $(DESTDIR)$(pkgdatadir)-$(VERSION)/java
-	install -D -m 644 GetTLE.class $(DESTDIR)$(pkgdatadir)-$(VERSION)/java
-	install -D -m 644 GetTLE.java $(DESTDIR)$(pkgdatadir)-$(VERSION)/java
+install-data-local:
+	$(INSTALL) -D -m 644 GetTLE.class $(DESTDIR)$(pkgdatadir)-$(VERSION)/java
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.