diff options
| -rw-r--r-- | ds9/macosx/Makefile.in | 9 | ||||
| -rw-r--r-- | ds9/unix/Makefile.in | 81 | ||||
| -rwxr-xr-x | ds9/win/Makefile.in | 11 |
3 files changed, 41 insertions, 60 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index f36ed46..f00280d 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -199,15 +199,16 @@ tcllib : cp -pr $(prefix)/tcllib/modules/textutil $(TKSAORES)/. cp -pr $(prefix)/tcllib/modules/math $(TKSAORES)/. -tkcon : - mkdir $(TKSAORES)/tkcon - cp -p $(prefix)/tkcon/*.tcl $(TKSAORES)/tkcon/. - tkblt : mkdir $(TKSAORES)/tkblt cp -p $(prefix)/tkblt/library/graph.tcl $(TKSAORES)/tkblt/. echo "pkg_mkIndex $(TKSAORES)/tkblt *.tcl; exit" | $(bindir)/tclsh8.6 +tkcon : + mkdir $(TKSAORES)/tkcon + cp -p $(prefix)/tkcon/*.tcl $(TKSAORES)/tkcon/. + echo "pkg_mkIndex $(TKSAORES)/tkcon *.tcl; exit" | $(bindir)/tclsh8.6 + xpa : cp -pr $(bindir)/xpans $(TKSAORES)/. diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index afea08a..03e4165 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -9,8 +9,6 @@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ -include $(prefix)/make.pkgs - TCL_VERSION = @TCL_VERSION@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ @@ -101,14 +99,14 @@ ds9 : ds9base ds9.zip cat ds9base ds9.zip > ds9 zip -A ds9 chmod 755 ds9 - cp ds9 ../../bin/. + cp ds9 $(prefix)/bin/. debug : ds9base ds9.zip $(RM) ds9 cat ds9base ds9.zip > ds9 zip -A ds9 chmod 755 ds9 - cp ds9 ../../bin/. + cp ds9 $(prefix)/bin/. else @@ -116,16 +114,16 @@ ds9 : ds9base ds9.zip $(RM) ds9 strip ds9base cp ds9base ds9 - cp ds9 ../../bin/. - cp ds9.zip ../../bin/. - cd ../../bin; codesign -s "$(ID)" ds9 + cp ds9 $(prefix)/bin/. + cp ds9.zip $(prefix)/bin/. + cd $(prefix)/bin; codesign -s "$(ID)" ds9 debug: ds9base ds9.zip $(RM) ds9 cp ds9base ds9 - cp ds9 ../../bin/. - cp ds9.zip ../../bin/. - cd ../../bin; codesign -s "$(ID)" ds9 + cp ds9 $(prefix)/bin/. + cp ds9.zip $(prefix)/bin/. + cd $(prefix)/bin; codesign -s "$(ID)" ds9 endif @@ -163,7 +161,7 @@ ds9base : $(OBJS) $(TK_LIBS) \ $(LIBS) -ds9.zip : $(ZDIR) $(FILES) +ds9.zip : $(ZDIR) framework $(FILES) $(RM) $@ find $(ZDIR) -depth -name "CVS" -exec rm -r {} \; zip -r ds9.zip $(ZDIR) @@ -172,65 +170,46 @@ tkAppInit.o : tkAppInit.c $(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \ -DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c tkAppInit.c -o $@ -tkAppInit.c : ../../tk$(TCL_VERSION)/unix/tkAppInit.c - cp ../../tk$(TCL_VERSION)/unix/tkAppInit.c . +tkAppInit.c : $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c + cp $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c . $(ZDIR) : + rm -rf $(ZDIR) mkdir $@ +framework : + cp -r ../library $(ZDIR)/. + cp -r ../msgs $(ZDIR)/. + cp -r ../doc $(ZDIR)/. + cp -r ../cmaps $(ZDIR)/. + cp -r ../template $(ZDIR)/. + $(ZDIR)/tcl$(TCL_VERSION) : $(prefix)/lib/tcl$(TCL_VERSION) - $(RM) -r $@ cp -r $(prefix)/lib/tcl$(TCL_VERSION) $(ZDIR)/. $(ZDIR)/tcl8 : $(prefix)/lib/tcl8 - $(RM) -r $@ cp -r $(prefix)/lib/tcl8 $(ZDIR)/. $(ZDIR)/tk$(TCL_VERSION) : $(prefix)/lib/tk$(TCL_VERSION) - $(RM) -r $@ cp -r $(prefix)/lib/tk$(TCL_VERSION) $(ZDIR)/. rm -rf $(ZDIR)/tk$(TCL_VERSION)/images rm -rf $(ZDIR)/tk$(TCL_VERSION)/demos -$(ZDIR)/tkblt : - $(RM) -r $@ - mkdir $(ZDIR)/tkblt - cp ../../tkblt/library/graph.tcl $(ZDIR)/tkblt/. - $(ZDIR)/tcllib : - $(RM) -r $@ mkdir $(ZDIR)/tcllib - cp -r ../../tcllib/modules/base64 $(ZDIR)/tcllib/. - cp -r ../../tcllib/modules/ftp $(ZDIR)/tcllib/. - cp -r ../../tcllib/modules/log $(ZDIR)/tcllib/. - cp -r ../../tcllib/modules/textutil $(ZDIR)/tcllib/. - cp -r ../../tcllib/modules/math $(ZDIR)/tcllib/. - -$(ZDIR)/tkcon : $(prefix)/lib/tkcon$(TKCONVER) - $(RM) -r $@ - cp -r $(prefix)/lib/tkcon$(TKCONVER) $@ - -$(ZDIR)/library : ../library/*.tcl - $(RM) -r $@ - cp -r ../library $(ZDIR)/. - -$(ZDIR)/msgs : ../msgs/* - $(RM) -r $@ - cp -r ../msgs $(ZDIR)/. - -$(ZDIR)/doc : ../doc/* ../doc/ref/* ../doc/user/* ../doc/release/* - $(RM) -r $@ - cd ..; find doc -name "*.html" | cpio -pdmuv unix/$(ZDIR) - cd ..; find doc -name "*.gif" | cpio -pdmuv unix/$(ZDIR) - cd ..; find doc -name "*.png" | cpio -pdmuv unix/$(ZDIR) + cp -r $(prefix)/tcllib/modules/base64 $(ZDIR)/tcllib/. + cp -r $(prefix)/tcllib/modules/ftp $(ZDIR)/tcllib/. + cp -r $(prefix)/tcllib/modules/log $(ZDIR)/tcllib/. + cp -r $(prefix)/tcllib/modules/textutil $(ZDIR)/tcllib/. + cp -r $(prefix)/tcllib/modules/math $(ZDIR)/tcllib/. -$(ZDIR)/cmaps : ../cmaps/* - $(RM) -r $@ - cp -r ../cmaps $(ZDIR)/. +$(ZDIR)/tkblt : + mkdir $(ZDIR)/tkblt + cp $(prefix)/tkblt/library/graph.tcl $(ZDIR)/tkblt/. -$(ZDIR)/template : ../template/* - $(RM) -r $@ - cd ..; find template -name "*.tpl" | cpio -pdmuv unix/$(ZDIR) +$(ZDIR)/tkcon : + mkdir $(ZDIR)/tkcon + cp $(prefix)/tkcon/*.tcl $@ #--------------------------cleanup diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index cbd1c71..48224ac 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -155,11 +155,6 @@ tcltk : cp -pr $(prefix)/lib/tcl8.6 $(APPDIR)/. cp -pr $(prefix)/lib/tk8.6 $(APPDIR)/. -tkblt : - mkdir $(APPDIR)/tkblt - cp -p $(prefix)/tkblt/library/graph.tcl $(APPDIR)/tkblt/. - echo "pkg_mkIndex ../../bin/ds9app/tkblt *.tcl; exit" | $(bindir)/tclsh86s - tcllib : cp -pr $(prefix)/tcllib/modules/base64 $(APPDIR)/. cp -pr $(prefix)/tcllib/modules/ftp $(APPDIR)/. @@ -167,9 +162,15 @@ tcllib : cp -pr $(prefix)/tcllib/modules/textutil $(APPDIR)/. cp -pr $(prefix)/tcllib/modules/math $(APPDIR)/. +tkblt : + mkdir $(APPDIR)/tkblt + cp -p $(prefix)/tkblt/library/graph.tcl $(APPDIR)/tkblt/. + echo "pkg_mkIndex ../../bin/ds9app/tkblt *.tcl; exit" | $(bindir)/tclsh86s + tkcon : mkdir $(APPDIR)/tkcon cp -p $(prefix)/tkcon/*.tcl $(APPDIR)/tkcon/. + echo "pkg_mkIndex ../../bin/ds9app/tkblt *.tcl; exit" | $(bindir)/tclsh86s xpa : cp -p $(bindir)/xpans.exe $(APPDIR)/. |