diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-02-01 22:40:38 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-02-01 22:40:38 (GMT) |
| commit | 22d0a702ce3f6d2d72163f99bc3f79149c706ef6 (patch) | |
| tree | 464a58bdaed1b58c24381578f3eb1b11e21d7fa6 /ds9 | |
| parent | 1c0425860c86e12df4940445fe5846344c29636f (diff) | |
| download | blt-22d0a702ce3f6d2d72163f99bc3f79149c706ef6.zip blt-22d0a702ce3f6d2d72163f99bc3f79149c706ef6.tar.gz blt-22d0a702ce3f6d2d72163f99bc3f79149c706ef6.tar.bz2 | |
simplify build
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/macosx/Makefile.in | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index c5e52e5..e7bfa10 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -141,11 +141,11 @@ $(MACDIR)/ds9 : ds9base $(PREQS) $(TCLFW)/Tcl $(TKFW)/Tk $(LIBDIR)/pcc-i386-snow cp -p ds9base "$@" strip "$@" install_name_tool -change \ - /Library/Frameworks/Tcl.framework/Versions/8.6/Tcl \ + /Library/Frameworks/Tcl.framework/Versions/$(TCL_VERSION)/Tcl \ @executable_path/../Frameworks/Tcl.framework/Tcl \ "$@" install_name_tool -change \ - /Library/Frameworks/Tk.framework/Versions/8.6/Tk \ + /Library/Frameworks/Tk.framework/Versions/$(TCL_VERSION)/Tk \ @executable_path/../Frameworks/Tk.framework/Tk \ "$@" cd $(bindir); codesign --deep -f -s "$(ID)" SAOImage\ DS9.app @@ -153,11 +153,11 @@ $(MACDIR)/ds9 : ds9base $(PREQS) $(TCLFW)/Tcl $(TKFW)/Tk $(LIBDIR)/pcc-i386-snow debug : ds9base $(PREQS) $(TCLFW)/Tcl $(TKFW)/Tk $(LIBDIR)/pcc-i386-snowleopard.tar.gz cp -p ds9base $(APPDIR)/Contents/MacOS/ds9 install_name_tool -change \ - /Library/Frameworks/Tcl.framework/Versions/8.6/Tcl \ + /Library/Frameworks/Tcl.framework/Versions/$(TCL_VERSION)/Tcl \ @executable_path/../Frameworks/Tcl.framework/Tcl \ $(APPDIR)/Contents/MacOS/ds9 install_name_tool -change \ - /Library/Frameworks/Tk.framework/Versions/8.6/Tk \ + /Library/Frameworks/Tk.framework/Versions/$(TCL_VERSION)/Tk \ @executable_path/../Frameworks/Tk.framework/Tk \ $(APPDIR)/Contents/MacOS/ds9 cd $(bindir); codesign --deep -f -s "$(ID)" SAOImage\ DS9.app @@ -182,15 +182,15 @@ ds9base : $(OBJS) $(LLIBS) $(APPDIR): cp -prf SAOImage\ DS9.app $(bindir)/. -$(TCLFW)/Tcl : $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Tcl - cp -pf $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Tcl $(TCLFW)/. - cp -prf $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Resources/* $(TCLDIR)/. +$(TCLFW)/Tcl : $(prefix)/build/tcl/Tcl.framework/Versions/$(TCL_VERSION)/Tcl + cp -pf $(prefix)/build/tcl/Tcl.framework/Versions/$(TCL_VERSION)/Tcl $(TCLFW)/. + cp -prf $(prefix)/build/tcl/Tcl.framework/Versions/$(TCL_VERSION)/Resources/* $(TCLDIR)/. -$(TKFW)/Tk : $(prefix)/build/tk/Tk.framework/Versions/8.6/Tk - cp -pf $(prefix)/build/tk/Tk.framework/Versions/8.6/Tk $(TKFW)/. - cp -pf $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/Info.plist $(TKDIR)/. - cp -pf $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/license.terms $(TKDIR)/. - cp -prf $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/Scripts $(TKDIR)/. +$(TKFW)/Tk : $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Tk + cp -pf $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Tk $(TKFW)/. + cp -pf $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Resources/Info.plist $(TKDIR)/. + cp -pf $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Resources/license.terms $(TKDIR)/. + cp -prf $(prefix)/build/tk/Tk.framework/Versions/$(TCL_VERSION)/Resources/Scripts $(TKDIR)/. $(LIBDIR)/xpans : $(bindir)/xpans cp -p $? "$@" |