diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-02-04 20:54:09 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-02-04 20:54:09 (GMT) |
| commit | 1665c12d60e699d3c3785d05d5068819f5651a05 (patch) | |
| tree | f50bfadf5c2d03fc9049b988710201ca9d45bd32 | |
| parent | b7ea9be84e1a1d58db919d8f63e00d00b283d949 (diff) | |
| download | blt-1665c12d60e699d3c3785d05d5068819f5651a05.zip blt-1665c12d60e699d3c3785d05d5068819f5651a05.tar.gz blt-1665c12d60e699d3c3785d05d5068819f5651a05.tar.bz2 | |
fix win fits bin filtering
| -rw-r--r-- | ds9/library/util.tcl | 3 | ||||
| -rwxr-xr-x | ds9/win/Makefile.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl index c71ef83..b52b81b 100644 --- a/ds9/library/util.tcl +++ b/ds9/library/util.tcl @@ -443,8 +443,9 @@ proc InitFilterCompiler {} { } } win32 { - set tcc [file join [file dirname $argv0] tcc/tcc.exe] + set tcc [file join [file dirname $argv0] ../tcc/tcc.exe] if {[file exists $tcc]} { + set env(FILTER_KEEP) 1 set env(FILTER_CC) [file nativename [file attributes [file normalize $tcc] -shortname]] set env(FILTER_TMPDIR) [file nativename [file attributes [file normalize $ds9(tmpdir)] -shortname]] } diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index 82177a3..93c6986 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -192,7 +192,7 @@ $(APPDIR)/install.vbs: install.vbs $(APPDIR)/tcc: $(prefix)/compilers/tcc-0.9.25-win32-bin.zip $(RM) -rf $@ - cd $(bindir); unzip %? + cd $(APPDIR); unzip $? chmod +x $@/tcc.exe touch $@ |