diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2016-12-30 21:40:07 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2016-12-30 21:40:07 (GMT) |
| commit | 0cdde4604b7a030366bc94fda1c6375656bebd31 (patch) | |
| tree | cba223fc885f0b77ca8672f7c073d8de521e0bac /ds9/win | |
| parent | e12a83aab7055d047eabf8ed6c38f2fe8ee16c4a (diff) | |
| parent | 5601ad1f0ce74117a3706837aae272280f7c48c7 (diff) | |
| download | blt-0cdde4604b7a030366bc94fda1c6375656bebd31.zip blt-0cdde4604b7a030366bc94fda1c6375656bebd31.tar.gz blt-0cdde4604b7a030366bc94fda1c6375656bebd31.tar.bz2 | |
Merge branch 'devel' of github.com:SAOImageDS9/SAOImageDS9 into devel
Diffstat (limited to 'ds9/win')
| -rwxr-xr-x | ds9/win/Makefile.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index cc9f419..574451f 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -10,6 +10,7 @@ mandir = @mandir@ include $(prefix)/make.pkgs +TCL_VERSION = @TCL_VERSION@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ TK_LIBS = @TK_LIBS@ @@ -107,13 +108,13 @@ winMain.o : winMain.c -DTK_LOCAL_APPINIT=SAOAppInit -DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook \ -c winMain.c -o $@ -winMain.c : $(prefix)/tk$(TCLVER)/win/winMain.c - cp $(prefix)/tk$(TCLVER)/win/winMain.c . +winMain.c : $(prefix)/tk$(TCL_VERSION)/win/winMain.c + cp $(prefix)/tk$(TCL_VERSION)/win/winMain.c . ds9.res.o: ds9.rc ds9.ico i686-w64-mingw32-windres -o $@ \ - --define STATIC_BUILD --include $(prefix)/tk$(TCLVER)/generic \ - --include $(prefix)/$(TCLDIR)/generic --include $(prefix)/tk$(TCLVER)/win/rc \ + --define STATIC_BUILD --include $(prefix)/tk$(TCL_VERSION)/generic \ + --include $(prefix)/$(TCLDIR)/generic --include $(prefix)/tk$(TCL_VERSION)/win/rc \ ds9.rc appdir : |