diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2015-03-08 18:42:07 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2015-03-08 18:42:07 -0400 |
| commit | 37ba3a5f18112d2453f427388b66b1da6fdcb5e7 (patch) | |
| tree | cee3809e8442ff5728e0df9bf97ca9f17fd2a4b2 /scripts | |
| parent | 2405f4c39d8b86eb6a08f056ab64e90917318e5c (diff) | |
| download | calfuse-37ba3a5f18112d2453f427388b66b1da6fdcb5e7.tar.gz | |
General cleanup. Purge fixed paths.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 9 | ||||
| -rw-r--r-- | scripts/Makefile.in | 9 | ||||
| -rwxr-xr-x | scripts/calfuse.wavecal | 4 | ||||
| -rwxr-xr-x | scripts/cf_make_all.csh.in (renamed from scripts/cf_make_all.csh) | 2 | ||||
| -rw-r--r-- | scripts/cfsetup.csh.in | 2 |
5 files changed, 18 insertions, 8 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` |