--- SAOImageDS9/unix/Makefile.in.orig 2021-11-08 16:46:07.000000000 +0100 +++ SAOImageDS9/unix/Makefile.in 2022-08-26 17:20:19.342748429 +0200 @@ -3,8 +3,8 @@ bindir = @bindir@ libdir = $(exec_prefix)/lib -#libdir = @libdir@ -includedir = @includedir@ +syslibdir = @libdir@ +includedir = $(prefix)/include datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ @@ -19,69 +19,23 @@ include ./make.include -WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/unix -WITHTK = --with-tk=$(prefix)/tk$(TCL_VERSION)/unix $(WITHTCL) +WITHTCL = --with-tcl=$(syslibdir)/tcl$(TCL_VERSION) +WITHTK = --with-tk=$(syslibdir) $(WITHTCL) CACHE = --config-cache --cache-file=$(prefix)/config.cache #--------------------------build -.PHONY : saods9 tcl tk +.PHONY : saods9 -saods9 : dirs tcl tk \ - openssl \ - xpa funtools ast \ +saods9 : dirs \ + funtools ast \ util vector fitsy \ tcliis tclsignal \ - tclzipfs tls tclxml \ - tkblt tclfitsy tktable tkimg \ + tclxml \ + tclfitsy tktable \ tkmpeg tksvg tkagif tkhtml1 tkcon \ tksao ds9 -tcl : tcl$(TCL_VERSION)/unix/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tcl$(TCL_VERSION)/unix -j $(JOBS) install - -tcl$(TCL_VERSION)/unix/Makefile : - @echo "" - @echo "*** $@ ***" - cd tcl$(TCL_VERSION)/unix; \ - ./configure \ - $(PREFIX) \ - --disable-shared --enable-symbols \ - $(CACHE) - -tk : tk$(TCL_VERSION)/unix/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tk$(TCL_VERSION)/unix -j $(JOBS) install - -tk$(TCL_VERSION)/unix/Makefile : - @echo "" - @echo "*** $@ ***" - cd tk$(TCL_VERSION)/unix; \ - ./configure \ - $(TKFLAGS) \ - $(PREFIX) \ - --disable-shared --enable-symbols \ - $(CACHE) - -#-------------------------- tclzipfs - -tclzipfs: tclzipfs/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tclzipfs install - -tclzipfs/Makefile : - @echo "" - @echo "*** $@ ***" - cd tclzipfs; \ - ./configure \ - $(WITHTCL) \ - $(PREFIX) \ - $(STD) \ - $(CACHE) #-------------------------- tclsignal @@ -102,24 +56,9 @@ #--------------------------clean -.PHONY : tclclean tkclean osclean tclzipfsclean tclsignalclean +.PHONY : osclean tclsignalclean -tclclean : - @echo "" - @echo "*** tclclean ***" - $(MAKE) -C tcl$(TCL_VERSION)/unix clean - -tkclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tk$(TCL_VERSION)/unix clean - -osclean : tclzipfsclean tclsignalclean - -tclzipfsclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tclzipfs clean +osclean : tclsignalclean tclsignalclean : @echo "" @@ -128,26 +67,9 @@ #--------------------------distclean -.PHONY : tcldistclean tkdistclean .PHONY : osdistclean tclzipfsdistclean tclsignaldistclean -tcldistclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tcl$(TCL_VERSION)/unix distclean - -tkdistclean : - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tk$(TCL_VERSION)/unix distclean - -osdistclean : tclzipfsdistclean tclsignaldistclean - -tclzipfsdistclean: - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tclzipfs distclean - rm -f tclzipfs/tclzipfsConfig.sh +osdistclean : tclsignaldistclean tclsignaldistclean : @echo "" @@ -161,4 +83,3 @@ dist : cd bin; tar cvf - ds9* | gzip > $(prefix)/dist/ds9.$(ARCH).$(DS9_VERSION).tar.gz - cd bin; tar cvf - xpa* | gzip > $(prefix)/dist/xpa.$(ARCH).$(XPA_VERSION).tar.gz