From 0ee40606be624d4995b145dd2732c7144d02d70c Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 28 Dec 2016 13:14:17 -0500 Subject: let tcl create standard dirs --- win/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/Makefile.in b/win/Makefile.in index 1ed6514..ecaa415 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -19,7 +19,7 @@ include ./make.include .PHONY : saods9 tcl tk tkwin libxml2 libxslt zlib -saods9 : dirs tcl tk \ +saods9 : tcl tk \ libxml2 libxslt zlib \ tclxml xpa \ tkblt tktable tkimg \ -- cgit v0.12 From 308de2f087de880ad32cc3e5ce88755e66786a6d Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 28 Dec 2016 13:27:19 -0500 Subject: let tcl create standard dirs --- unix/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index 4b4b915..4a90e55 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -15,7 +15,7 @@ include ./make.include .PHONY : saods9 tcl tk -saods9 : dirs tcl tk \ +saods9 : tcl tk \ tclcheckdns tcliis tclsignal \ tclzvfs tclxml xpa \ tkblt tktable tkimg \ -- cgit v0.12 From 11aba4552b84494cd968e10a7dc32b4ede6e7695 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 13:26:42 -0500 Subject: new config vars --- unix/Makefile.in | 21 +++++++++++++++------ unix/configure | 5 +++-- unix/configure.in | 6 ++++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index 4a90e55..8170e8b 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1,12 +1,22 @@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +libdir = $(exec_prefix)/lib +#libdir = @libdir@ +includedir = @includedir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +mandir = @mandir@ + OS = @OS@ ARCH = @ARCH@ -ROOT = @ROOT@ TKFLAGS = @TKFLAGS@ TKIMGFLAGS = @TKIMGFLAGS@ JOBS = @CORES@ -WITHTCL =--with-tcl=$(ROOT)/tcl$(TCLVER)/unix -WITHTK =--with-tk=$(ROOT)/tk$(TCLVER)/unix $(WITHTCL) +WITHTCL =--with-tcl=$(prefix)/tcl$(TCLVER)/unix +WITHTK =--with-tk=$(prefix)/tk$(TCLVER)/unix $(WITHTCL) CACHE =--config-cache --cache-file=../config.cache include ./make.include @@ -32,7 +42,7 @@ tcl$(TCLVER)/unix/Makefile : @echo "*** Configure tcl$(TCLVER) ***" cd tcl$(TCLVER)/unix; \ ./configure \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ --config-cache --cache-file=../../config.cache @@ -47,7 +57,7 @@ tk$(TCLVER)/unix/Makefile : cd tk$(TCLVER)/unix; \ ./configure \ $(TKFLAGS) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ --config-cache --cache-file=../../config.cache @@ -70,4 +80,3 @@ tkunixdistclean : dist : cd bin; tar cvf - ds9* | gzip > ../dist/ds9.$(ARCH).$(DS9VERSION).tar.gz cd bin; tar cvf - xpa* | gzip > ../dist/xpa.$(ARCH).$(XPAVERSION).tar.gz - diff --git a/unix/configure b/unix/configure index e21efe5..e2dbd89 100755 --- a/unix/configure +++ b/unix/configure @@ -586,7 +586,6 @@ LIBOBJS CORES TKIMGFLAGS TKFLAGS -ROOT ARCH OS PKG_CFLAGS @@ -1861,7 +1860,9 @@ OS="unix" ARCH=$with_arch -ROOT=$ac_pwd +prefix=$ac_pwd + +exec_prefix=$ac_pwd diff --git a/unix/configure.in b/unix/configure.in index c54ad99..a9d43c4 100755 --- a/unix/configure.in +++ b/unix/configure.in @@ -41,8 +41,10 @@ AC_SUBST(OS) ARCH=$with_arch AC_SUBST(ARCH) -ROOT=$ac_pwd -AC_SUBST(ROOT) +prefix=$ac_pwd +AC_SUBST(prefix) +exec_prefix=$ac_pwd +AC_SUBST(exec_prefix) TEA_CONFIG_SYSTEM -- cgit v0.12 From 832f238c0c1ea826eee08e0d4c5880ee658293cb Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 13:27:04 -0500 Subject: new config vars --- make.include | 76 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/make.include b/make.include index 3863833..f33d0d7 100644 --- a/make.include +++ b/make.include @@ -2,7 +2,7 @@ include ./make.pkgs #-------------------------- dirs -DIRS = bin lib include man share dist +DIRS = $(bindir) $(libdir) $(includedir) $(mandir) $(datadir) dist #-------------------------- cvs stuff @@ -57,7 +57,7 @@ ds9/$(OS)/Makefile : cd ds9/$(OS); \ ./configure \ $(WITHTK) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --enable-symbols #-------------------------- tclcheckdns @@ -73,7 +73,7 @@ tclcheckdns/Makefile : cd tclcheckdns; \ ./configure \ $(WITHTCL) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -90,7 +90,7 @@ tcliis/Makefile : cd tcliis; \ ./configure \ $(WITHTCL) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -107,7 +107,7 @@ tclsignal/Makefile : cd tclsignal; \ ./configure \ $(WITHTCL) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -126,7 +126,7 @@ tclxml/Makefile : ./configure \ $(WITHTCL) \ $(TCLXMLFLAGS) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -143,7 +143,7 @@ tclzvfs/Makefile : cd tclzvfs; \ ./configure \ $(WITHTCL) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -162,7 +162,7 @@ xpa/Makefile : ./configure \ $(CONFIGFLAGS) $(TARGET) $(XPAFLAGS) \ $(WITHTCL) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ --with-x=disabled @@ -179,7 +179,7 @@ tkblt/Makefile : cd tkblt; \ ./configure \ $(WITHTK) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -188,9 +188,9 @@ tkblt/Makefile : tkcon : @echo "" @echo "*** Install $@ ***" - $(RM) -r lib/tkcon$(TKCONVER) - mkdir lib/tkcon$(TKCONVER) - cp tkcon/*.tcl lib/tkcon$(TKCONVER) + $(RM) -r $(libdir)/tkcon$(TKCONVER) + mkdir $(libdir)/tkcon$(TKCONVER) + cp tkcon/*.tcl $(libdir)/tkcon$(TKCONVER) #-------------------------- tkhtml1 @@ -208,7 +208,7 @@ tkhtml1/Makefile : cd tkhtml1; \ ./configure \ $(WITHTK) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -227,7 +227,7 @@ tkimg/Makefile : ./configure \ CFLAGS='-DPNG_NO_WRITE_gAMA' \ $(WITHTK) $(TKIMGFLAGS) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols #-------------------------- tkmpeg @@ -243,7 +243,7 @@ tkmpeg/Makefile : cd tkmpeg; \ ./configure \ $(WITHTK) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -260,7 +260,7 @@ tksao/Makefile : cd tksao; \ ./configure \ $(WITHTK) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -277,7 +277,7 @@ ast/Makefile : --without-pthreads --enable-shared=no \ star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no \ $(CONFIGFLAGS) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared cd ast; touch configure.ac aclocal.m4 configure Makefile.am Makefile.in @@ -288,32 +288,32 @@ ast/ast.h : $(MAKE) -C ast -j $(JOBS) libast.la $(MAKE) -C ast -j $(JOBS) libast_err.la $(MAKE) -C ast -j $(JOBS) libast_pal.la - cp ast/ast.h $(ROOT)/include/. - cp ast/grf.h $(ROOT)/include/. - cp ast/grf3d.h $(ROOT)/include/. - cp ast/.libs/libast.a $(ROOT)/lib/. - cp ast/.libs/libast_err.a $(ROOT)/lib/. - cp ast/.libs/libast_pal.a $(ROOT)/lib/. + cp ast/ast.h $(includedir)/. + cp ast/grf.h $(includedir)/. + cp ast/grf3d.h $(includedir)/. + cp ast/.libs/libast.a $(libdir)/. + cp ast/.libs/libast_err.a $(libdir)/. + cp ast/.libs/libast_pal.a $(libdir)/. ast/.libs/libast.a : @echo "" @echo "*** Install ast/ast.h ***" $(MAKE) -C ast -j ast.h - cp ast/ast.h $(ROOT)/include/. - cp ast/grf.h $(ROOT)/include/. - cp ast/grf3d.h $(ROOT)/include/. + cp ast/ast.h $(includedir)/. + cp ast/grf.h $(includedir)/. + cp ast/grf3d.h $(includedir)/. ast/.libs/libast_err.a : @echo "" @echo "*** Install ast/libast_err.a ***" $(MAKE) -C ast -j $(JOBS) libast_err.la - cp ast/.libs/libast_err.a $(ROOT)/lib/. + cp ast/.libs/libast_err.a $(libdir)/. ast/.libs/libast_pal.a : @echo "" @echo "*** Install ast/libast_pal.a ***" $(MAKE) -C ast -j $(JOBS) libast_pal.la - cp ast/.libs/libast_pal.a $(ROOT)/lib/. + cp ast/.libs/libast_pal.a $(libdir)/. #-------------------------- funtools @@ -324,20 +324,20 @@ funtools/libfuntools.a : funtools/Makefile @echo "" @echo "*** Install funtools ***" $(MAKE) -C funtools lib - cp funtools/funtools.h $(ROOT)/include/. - cp funtools/filter/*.h $(ROOT)/include/. - cp funtools/util/*.h $(ROOT)/include/. - cp funtools/fitsy/*.h $(ROOT)/include/. - cp funtools/libfuntools.a $(ROOT)/lib/. + cp funtools/funtools.h $(includedir)/. + cp funtools/filter/*.h $(includedir)/. + cp funtools/util/*.h $(includedir)/. + cp funtools/fitsy/*.h $(includedir)/. + cp funtools/libfuntools.a $(libdir)/. funtools/Makefile : funtools/configure @echo "" @echo "*** Configure funtools ***" cd funtools; \ ./configure \ - --with-zlib=../lib --with-wcslib=../lib \ + --with-zlib=$(libdir) --with-wcslib=$(libdir) \ $(CONFIGFLAGS) $(TARGET) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared funtools/configure : @@ -358,7 +358,7 @@ tktable/Makefile : cd tktable; \ ./configure \ $(WITHTK) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ $(CACHE) @@ -441,7 +441,7 @@ tkhtml1clean: tkimgclean: rm -fr tkimg/Img/* - rm -fr lib/Img1.* + rm -fr $(libdir)/Img1.* $(MAKE) -C tkimg clean tkmpegclean: @@ -519,7 +519,7 @@ tkhtml1distclean: tkimgdistclean: rm -fr tkimg/Img/* - rm -fr lib/Img1.* + rm -fr $(libdir)/Img1.* $(MAKE) -C tkimg distclean tkmpegdistclean: -- cgit v0.12 From 94182198321e236709a2a1b4c366f27ef42bb629 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 13:27:11 -0500 Subject: new config vars --- ds9/unix/Makefile.in | 82 +++++++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index 653472d..3415782 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -1,4 +1,14 @@ -include ../../make.pkgs +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +mandir = @mandir@ + +include $(prefix)/make.pkgs TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ @@ -53,33 +63,33 @@ FILES = \ $(ZDIR)/template LLIBS = \ - ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ - ../../lib/libfuntools.a \ - ../../lib/libast.a \ - ../../lib/libast_err.a \ - ../../lib/libast_pal.a \ - ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ - ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \ - ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \ - ../../lib/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \ - ../../lib/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \ - ../../lib/Img$(TKIMGVER)/libtkimgpng1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libpngtcl1.4.12.a \ - ../../lib/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libtifftcl3.9.4.a \ - ../../lib/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libjpegtcl8.4.a \ - ../../lib/Img$(TKIMGVER)/libtkimggif1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \ - ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \ - ../../lib/tclzvfs$(TCLZVFSVER)/libtclzvfs$(TCLZVFSVER).a \ - ../../lib/libxpa.a \ - ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \ - ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \ - ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \ - ../../lib/tkblt$(TKBLTVER)/libtkbltstub$(TKBLTVER).a \ - ../../lib/tkblt$(TKBLTVER)/libtkblt$(TKBLTVER).a + $(libdir)/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ + $(libdir)/libfuntools.a \ + $(libdir)/libast.a \ + $(libdir)/libast_err.a \ + $(libdir)/libast_pal.a \ + $(libdir)/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ + $(libdir)/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \ + $(libdir)/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \ + $(libdir)/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \ + $(libdir)/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \ + $(libdir)/Img$(TKIMGVER)/libtkimgpng1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libpngtcl1.4.12.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libtifftcl3.9.4.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libjpegtcl8.4.a \ + $(libdir)/Img$(TKIMGVER)/libtkimggif1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libzlibtcl1.2.8.a \ + $(libdir)/Img$(TKIMGVER)/libtkimg1.4.2.a \ + $(libdir)/tclzvfs$(TCLZVFSVER)/libtclzvfs$(TCLZVFSVER).a \ + $(libdir)/libxpa.a \ + $(libdir)/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \ + $(libdir)/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \ + $(libdir)/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \ + $(libdir)/tkblt$(TKBLTVER)/libtkbltstub$(TKBLTVER).a \ + $(libdir)/tkblt$(TKBLTVER)/libtkblt$(TKBLTVER).a #--------------------------main @@ -147,17 +157,17 @@ tkAppInit.c : ../../tk$(TCLVER)/unix/tkAppInit.c $(ZDIR) : mkdir $@ -$(ZDIR)/tcl$(TCLVER) : ../../lib/tcl$(TCLVER) +$(ZDIR)/tcl$(TCLVER) : $(prefix)/lib/tcl$(TCLVER) $(RM) -r $@ - cp -r ../../lib/tcl$(TCLVER) $(ZDIR)/. + cp -r $(prefix)/lib/tcl$(TCLVER) $(ZDIR)/. -$(ZDIR)/tcl8 : ../../lib/tcl8 +$(ZDIR)/tcl8 : $(prefix)/lib/tcl8 $(RM) -r $@ - cp -r ../../lib/tcl8 $(ZDIR)/. + cp -r $(prefix)/lib/tcl8 $(ZDIR)/. -$(ZDIR)/tk$(TCLVER) : ../../lib/tk$(TCLVER) +$(ZDIR)/tk$(TCLVER) : $(prefix)/lib/tk$(TCLVER) $(RM) -r $@ - cp -r ../../lib/tk$(TCLVER) $(ZDIR)/. + cp -r $(prefix)/lib/tk$(TCLVER) $(ZDIR)/. rm -rf $(ZDIR)/tk$(TCLVER)/images rm -rf $(ZDIR)/tk$(TCLVER)/demos @@ -175,9 +185,9 @@ $(ZDIR)/tcllib : cp -r ../../tcllib/modules/textutil $(ZDIR)/tcllib/. cp -r ../../tcllib/modules/math $(ZDIR)/tcllib/. -$(ZDIR)/tkcon : ../../lib/tkcon$(TKCONVER) +$(ZDIR)/tkcon : $(prefix)/lib/tkcon$(TKCONVER) $(RM) -r $@ - cp -r ../../lib/tkcon$(TKCONVER) $@ + cp -r $(prefix)/lib/tkcon$(TKCONVER) $@ $(ZDIR)/library : ../library/*.tcl $(RM) -r $@ -- cgit v0.12 From 827cef9922fa6abc01b3091ff4621c0831cae7f7 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 13:33:08 -0500 Subject: new config vars --- unix/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index 8170e8b..29a4ac8 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -42,7 +42,7 @@ tcl$(TCLVER)/unix/Makefile : @echo "*** Configure tcl$(TCLVER) ***" cd tcl$(TCLVER)/unix; \ ./configure \ - --prefix $(prefix) --exec-prefix $(prefix) --libdir $(libdir) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ --config-cache --cache-file=../../config.cache @@ -57,7 +57,7 @@ tk$(TCLVER)/unix/Makefile : cd tk$(TCLVER)/unix; \ ./configure \ $(TKFLAGS) \ - --prefix $(prefix) --exec-prefix $(prefix) --libdir $(libdir) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ --config-cache --cache-file=../../config.cache -- cgit v0.12 From 574ccc34f9a00b7386553680fb7eac5059d644d1 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 13:53:17 -0500 Subject: new config vars --- macosx/Makefile.in | 18 ++++++++++++++---- macosx/configure | 5 +++-- macosx/configure.in | 6 ++++-- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/macosx/Makefile.in b/macosx/Makefile.in index 509f1e3..33f9d05 100644 --- a/macosx/Makefile.in +++ b/macosx/Makefile.in @@ -1,10 +1,20 @@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +libdir = $(exec_prefix)/lib +#libdir = @libdir@ +includedir = @includedir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +mandir = @mandir@ + OS = @OS@ ARCH = @ARCH@ -ROOT = @ROOT@ JOBS = @CORES@ -WITHTCL =--with-tcl=$(ROOT)/build/tcl/Development -WITHTK =--with-tk=$(ROOT)/build/tk/Development $(WITHTCL) +WITHTCL =--with-tcl=$(prefix)/build/tcl/Development +WITHTK =--with-tk=$(prefix)/build/tk/Development $(WITHTCL) CACHE =--config-cache --cache-file=../config.cache include ./make.include @@ -97,7 +107,7 @@ tkmacosx/Makefile : cd tkmacosx; \ ./configure \ $(WITHTK) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ --config-cache --cache-file=../config.cache diff --git a/macosx/configure b/macosx/configure index bf86ffa..bf983be 100755 --- a/macosx/configure +++ b/macosx/configure @@ -584,7 +584,6 @@ PACKAGE_URL='' ac_subst_vars='LTLIBOBJS LIBOBJS CORES -ROOT ARCH OS PKG_CFLAGS @@ -1859,7 +1858,9 @@ OS="macosx" ARCH=$with_arch -ROOT=$ac_pwd +prefix=$ac_pwd + +exec_prefix=$ac_pwd CORES=`sysctl -n "hw.ncpu"` diff --git a/macosx/configure.in b/macosx/configure.in index 67cc035..b2aa4b8 100755 --- a/macosx/configure.in +++ b/macosx/configure.in @@ -41,8 +41,10 @@ AC_SUBST(OS) ARCH=$with_arch AC_SUBST(ARCH) -ROOT=$ac_pwd -AC_SUBST(ROOT) +prefix=$ac_pwd +AC_SUBST(prefix) +exec_prefix=$ac_pwd +AC_SUBST(exec_prefix) CORES=`sysctl -n "hw.ncpu"` AC_SUBST(CORES) -- cgit v0.12 From b9a3ca7ff17f96e464787f64243f2592e591505b Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 13:53:33 -0500 Subject: new config vars --- ds9/macosx/Makefile.in | 138 ++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 64 deletions(-) diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index fc26af9..6099233 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -1,4 +1,14 @@ -include ../../make.pkgs +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +mandir = @mandir@ + +include $(prefix)/make.pkgs TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ @@ -37,41 +47,41 @@ ID = $(shell finger $(shell whoami) | egrep -o 'Name: [a-zA-Z0-9 ]{1,}' | cut -d OBJS = ds9.o tkAppInit.o LLIBS = \ - ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ - ../../lib/libfuntools.a \ - ../../lib/libast.a \ - ../../lib/libast_err.a \ - ../../lib/libast_pal.a \ - ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ - ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \ - ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \ - ../../lib/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \ - ../../lib/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \ - ../../lib/Img$(TKIMGVER)/libtkimgpng1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libpngtcl1.4.12.a \ - ../../lib/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libtifftcl3.9.4.a \ - ../../lib/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libjpegtcl8.4.a \ - ../../lib/Img$(TKIMGVER)/libtkimggif1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \ - ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \ - ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \ - ../../lib/libxpa.a \ - ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \ - ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \ - ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \ - ../../lib/tkblt$(TKBLTVER)/libtkbltstub$(TKBLTVER).a \ - ../../lib/tkblt$(TKBLTVER)/libtkblt$(TKBLTVER).a \ - ../../lib/tkmacosx$(TKMACOSXVER)/libtkmacosx$(TKMACOSXVER).a - -APPDIR = ../../bin/SAOImage\ DS9.app -TKSAOFW = ../../bin/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework -TKSAORES= ../../bin/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework/Resources -TCLFW = ../../bin/SAOImage\ DS9.app/Contents/Frameworks/Tcl.framework -TCLRES = ../../bin/SAOImage\ DS9.app/Contents/Frameworks/Tcl.framework/Resources -TKFW = ../../bin/SAOImage\ DS9.app/Contents/Frameworks/Tk.framework -TKRES = ../../bin/SAOImage\ DS9.app/Contents/Frameworks/Tk.framework/Resources + $(libdir)/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ + $(libdir)/libfuntools.a \ + $(libdir)/libast.a \ + $(libdir)/libast_err.a \ + $(libdir)/libast_pal.a \ + $(libdir)/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ + $(libdir)/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \ + $(libdir)/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \ + $(libdir)/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \ + $(libdir)/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \ + $(libdir)/Img$(TKIMGVER)/libtkimgpng1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libpngtcl1.4.12.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libtifftcl3.9.4.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libjpegtcl8.4.a \ + $(libdir)/Img$(TKIMGVER)/libtkimggif1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \ + $(libdir)/Img$(TKIMGVER)/libzlibtcl1.2.8.a \ + $(libdir)/Img$(TKIMGVER)/libtkimg1.4.2.a \ + $(libdir)/libxpa.a \ + $(libdir)/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \ + $(libdir)/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \ + $(libdir)/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \ + $(libdir)/tkblt$(TKBLTVER)/libtkbltstub$(TKBLTVER).a \ + $(libdir)/tkblt$(TKBLTVER)/libtkblt$(TKBLTVER).a \ + $(libdir)/tkmacosx$(TKMACOSXVER)/libtkmacosx$(TKMACOSXVER).a + +APPDIR = $(bindir)/SAOImage\ DS9.app +TKSAOFW = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework +TKSAORES= $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tksao.framework/Resources +TCLFW = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tcl.framework +TCLRES = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tcl.framework/Resources +TKFW = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tk.framework +TKRES = $(bindir)/SAOImage\ DS9.app/Contents/Frameworks/Tk.framework/Resources #--------------------------main @@ -90,7 +100,7 @@ ds9 : ds9base appdir framework tcl tk tcllib tkcon tkblt xpa compiler cleanup /Library/Frameworks/Tk.framework/Versions/8.6/Tk \ @executable_path/../Frameworks/Tk.framework/Tk \ $(APPDIR)/Contents/MacOS/ds9 - cd ../../bin; codesign --deep -f -s "$(ID)" SAOImage\ DS9.app + cd $(bindir); codesign --deep -f -s "$(ID)" SAOImage\ DS9.app debug : ds9base appdir framework tcl tk tcllib tkcon tkblt xpa compiler cleanup cp -p ds9base $(APPDIR)/Contents/MacOS/ds9 @@ -102,14 +112,14 @@ debug : ds9base appdir framework tcl tk tcllib tkcon tkblt xpa compiler cleanup /Library/Frameworks/Tk.framework/Versions/8.6/Tk \ @executable_path/../Frameworks/Tk.framework/Tk \ $(APPDIR)/Contents/MacOS/ds9 - cd ../../bin; codesign --deep -f -s "$(ID)" SAOImage\ DS9.app + cd $(bindir); codesign --deep -f -s "$(ID)" SAOImage\ DS9.app tkAppInit.o : tkAppInit.c $(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \ -DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c tkAppInit.c -o $@ -tkAppInit.c : ../../tk$(TCLVER)/unix/tkAppInit.c - cp ../../tk$(TCLVER)/unix/tkAppInit.c . +tkAppInit.c : $(prefix)/tk$(TCLVER)/unix/tkAppInit.c + cp $(prefix)/tk$(TCLVER)/unix/tkAppInit.c . ds9base : $(OBJS) $(LLIBS) $(RM) $@ @@ -123,7 +133,7 @@ ds9base : $(OBJS) $(LLIBS) appdir : rm -rf $(APPDIR) - cp -rp SAOImage\ DS9.app ../../bin/. + cp -rp SAOImage\ DS9.app $(bindir)/. framework: cp -pr ../library $(TKSAORES)/. @@ -133,55 +143,55 @@ framework: cp -pr ../template $(TKSAORES)/. rm $(TKSAORES)/library/source.tcl - echo "pkg_mkIndex $(TKSAORES)/library *.tcl; exit" | ../../bin/tclsh8.6 + echo "pkg_mkIndex $(TKSAORES)/library *.tcl; exit" | $(bindir)/tclsh8.6 tcl : - cp -p ../../build/tcl/Tcl.framework/Versions/8.6/Tcl $(TCLFW)/. - cp -pr ../../build/tcl/Tcl.framework/Versions/8.6/Resources/* $(TCLRES)/. + cp -p $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Tcl $(TCLFW)/. + cp -pr $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Resources/* $(TCLRES)/. tcl_debug: - cp -p ../../build/tcl/Tcl.framework/Versions/8.6/Tcl_debug $(TCLFW)/Tcl - cp -pr ../../build/tcl/Tcl.framework/Versions/8.6/Resources/* $(TCLRES)/. + cp -p $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Tcl_debug $(TCLFW)/Tcl + cp -pr $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Resources/* $(TCLRES)/. tk : - cp -p ../../build/tk/Tk.framework/Versions/8.6/Tk $(TKFW)/. - cp -p ../../build/tk/Tk.framework/Versions/8.6/Resources/Info.plist \ + cp -p $(prefix)/build/tk/Tk.framework/Versions/8.6/Tk $(TKFW)/. + cp -p $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/Info.plist \ $(TKRES)/. - cp -p ../../build/tk/Tk.framework/Versions/8.6/Resources/license.terms \ + cp -p $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/license.terms \ $(TKRES)/. - cp -rp ../../build/tk/Tk.framework/Versions/8.6/Resources/Scripts \ + cp -rp $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/Scripts \ $(TKRES)/. tk_debug: - cp -p ../../build/tk/Tk.framework/Versions/8.6/Tk_debug $(TKFW)/Tk - cp -p ../../build/tk/Tk.framework/Versions/8.6/Resources/Info.plist \ + cp -p $(prefix)/build/tk/Tk.framework/Versions/8.6/Tk_debug $(TKFW)/Tk + cp -p $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/Info.plist \ $(TKRES)/. - cp -p ../../build/tk/Tk.framework/Versions/8.6/Resources/license.terms \ + cp -p $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/license.terms \ $(TKRES)/. - cp -rp ../../build/tk/Tk.framework/Versions/8.6/Resources/Scripts \ + cp -rp $(prefix)/build/tk/Tk.framework/Versions/8.6/Resources/Scripts \ $(TKRES)/. tcllib : - cp -pr ../../tcllib/modules/base64 $(TKSAORES)/. - cp -pr ../../tcllib/modules/ftp $(TKSAORES)/. - cp -pr ../../tcllib/modules/log $(TKSAORES)/. - cp -pr ../../tcllib/modules/textutil $(TKSAORES)/. - cp -pr ../../tcllib/modules/math $(TKSAORES)/. + cp -pr $(prefix)/tcllib/modules/base64 $(TKSAORES)/. + cp -pr $(prefix)/tcllib/modules/ftp $(TKSAORES)/. + cp -pr $(prefix)/tcllib/modules/log $(TKSAORES)/. + cp -pr $(prefix)/tcllib/modules/textutil $(TKSAORES)/. + cp -pr $(prefix)/tcllib/modules/math $(TKSAORES)/. tkcon : mkdir $(TKSAORES)/tkcon - cp -p ../../tkcon/*.tcl $(TKSAORES)/tkcon/. + cp -p $(prefix)/tkcon/*.tcl $(TKSAORES)/tkcon/. tkblt : mkdir $(TKSAORES)/tkblt - cp -p ../../tkblt/library/graph.tcl $(TKSAORES)/tkblt/. - echo "pkg_mkIndex $(TKSAORES)/tkblt *.tcl; exit" | ../../bin/tclsh8.6 + cp -p $(prefix)/tkblt/library/graph.tcl $(TKSAORES)/tkblt/. + echo "pkg_mkIndex $(TKSAORES)/tkblt *.tcl; exit" | $(bindir)/tclsh8.6 xpa : - cp -pr ../../bin/xpans $(TKSAORES)/. + cp -pr $(bindir)/xpans $(TKSAORES)/. compiler: - cp -p ../../compilers/pcc-i386-snowleopard.tar.gz $(TKSAORES)/. + cp -p $(prefix)/compilers/pcc-i386-snowleopard.tar.gz $(TKSAORES)/. cleanup: cd $(APPDIR); find . -depth -name CVS -exec rm -rf {} \; -- cgit v0.12 From e80e17b3751fb7d84563c747ef90b85e1af746ed Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 14:11:24 -0500 Subject: update config vars --- win/Makefile.in | 28 +++++++++++++++++++--------- win/configure | 5 +++-- win/configure.in | 6 ++++-- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/win/Makefile.in b/win/Makefile.in index ecaa415..b0b23b1 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -1,6 +1,16 @@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +libdir = $(exec_prefix)/lib +#libdir = @libdir@ +includedir = @includedir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +mandir = @mandir@ + OS = @OS@ ARCH = @ARCH@ -ROOT = @ROOT@ EXEEXT = @EXEEXT@ JOBS = @CORES@ @@ -9,8 +19,8 @@ ASTFLAGS =CFLAGS=-DCMINPACK_NO_DLL XPAFLAGS =CFLAGS=-DSTATIC_BUILD TCLXMLFLAGS =--with-xml-static=yes TARGET =--build=x86_64-unknown-mingw32 -WITHTCL =--with-tcl=$(ROOT)/tcl$(TCLVER)/win -WITHTK =--with-tk=$(ROOT)/tk$(TCLVER)/win $(WITHTCL) +WITHTCL =--with-tcl=$(prefix)/tcl$(TCLVER)/win +WITHTK =--with-tk=$(prefix)/tk$(TCLVER)/win $(WITHTCL) CACHE =--config-cache --cache-file=../config.cache include ./make.include @@ -40,7 +50,7 @@ tcl$(TCLVER)/win/Makefile : @echo "*** Configure tcl$(TCLVER) ***" cd tcl$(TCLVER)/win; \ ./configure \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared \ --config-cache --cache-file=../../config.cache @@ -56,7 +66,7 @@ tk$(TCLVER)/win/Makefile : ./configure \ $(WITHTCL) \ $(TKFLAGS) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols tkwin: tkwin/Makefile @@ -70,7 +80,7 @@ tkwin/Makefile : cd tkwin; \ ./configure \ $(WITHTK) \ - --prefix $(ROOT) --exec-prefix $(ROOT) \ + --prefix $(prefix) --exec-prefix $(exec_prefix) \ --disable-shared --enable-symbols \ --config-cache --cache-file=../../config.cache @@ -80,7 +90,7 @@ libxml2 : libxml2/win32/config.mingw $(MAKE) -C libxml2/win32 -j $(JOBS) -f Makefile.mingw dep $(MAKE) -C libxml2/win32 -j $(JOBS) -f Makefile.mingw libxmla $(MAKE) -C libxml2/win32 -j $(JOBS) -f Makefile.mingw install-libsa - cp libxml2/win32/xml2-config $(ROOT)/bin + cp libxml2/win32/xml2-config $(exec_prefix)/bin libxml2/win32/config.mingw : @echo "" @@ -95,7 +105,7 @@ libxslt : libxslt/win32/config.mingw $(MAKE) -C libxslt/win32 -j $(JOBS) -f Makefile.mingw libxslta $(MAKE) -C libxslt/win32 -j $(JOBS) -f Makefile.mingw libexslta $(MAKE) -C libxslt/win32 -j $(JOBS) -f Makefile.mingw install-libsa - cp libxslt/win32/xslt-config $(ROOT)/bin + cp libxslt/win32/xslt-config $(exec_prefix)/bin libxslt/win32/config.mingw : @echo "" @@ -114,7 +124,7 @@ zlib_Makefile : @echo "*** Configure zlib ***" cd zlib; \ $(CONFIGFLAGS) CFLAGS=-DSTATIC_BUILD=1 ./configure \ - --prefix $(ROOT) --eprefix $(ROOT) \ + --prefix $(prefix) -eprefix $(exec_prefix) --libdir $(libdir) \ --static #--------------------------clean diff --git a/win/configure b/win/configure index 968d925..c0959b5 100755 --- a/win/configure +++ b/win/configure @@ -584,7 +584,6 @@ PACKAGE_URL='' ac_subst_vars='LTLIBOBJS LIBOBJS CORES -ROOT ARCH OS PKG_CFLAGS @@ -1859,7 +1858,9 @@ OS="win" ARCH=$with_arch -ROOT=$ac_pwd +prefix=$ac_pwd + +exec_prefix=$ac_pwd CORES=`grep -c ^processor /proc/cpuinfo` diff --git a/win/configure.in b/win/configure.in index 150e467..25074c1 100755 --- a/win/configure.in +++ b/win/configure.in @@ -41,8 +41,10 @@ AC_SUBST(OS) ARCH=$with_arch AC_SUBST(ARCH) -ROOT=$ac_pwd -AC_SUBST(ROOT) +prefix=$ac_pwd +AC_SUBST(prefix) +exec_prefix=$ac_pwd +AC_SUBST(exec_prefix) CORES=`grep -c ^processor /proc/cpuinfo` AC_SUBST(CORES) -- cgit v0.12 From 42eab1775603681a2944cbbf65f26cc85fc1a4a1 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 14:11:39 -0500 Subject: update config vars --- ds9/win/Makefile.in | 102 ++++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 46 deletions(-) diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index fda5e0b..481b6e9 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -1,4 +1,14 @@ -include ../../make.pkgs +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +mandir = @mandir@ + +include $(prefix)/make.pkgs TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_STUB_LIB_SPEC= @TCL_STUB_LIB_SPEC@ @@ -37,34 +47,34 @@ STRIP = i686-w64-mingw32-strip.exe OBJS = ds9.o winMain.o ds9.res.o LLIBS = \ - ../../lib/tksao$(TKSAOVER)/tksao10.a \ - ../../lib/libfuntools.a \ - ../../lib/libast.a \ - ../../lib/libast_err.a \ - ../../lib/libast_pal.a \ - ../../lib/tksao$(TKSAOVER)/tksao10.a \ - ../../lib/tkhtml1$(TKHTMLVER)/tkhtml110.a \ - ../../lib/tkmpeg$(TKMPEGVER)/tkmpeg10.a \ - ../../lib/Tclxml$(TCLXMLVER)/Tclxml32.a \ - ../../lib/Tktable$(TKTABLEVER)/Tktable210.a \ - ../../lib/Img$(TKIMGVER)/libtkimgpng142.a \ - ../../lib/Img$(TKIMGVER)/libpngtcl1412.a \ - ../../lib/Img$(TKIMGVER)/libtkimgtiff142.a \ - ../../lib/Img$(TKIMGVER)/libtifftcl394.a \ - ../../lib/Img$(TKIMGVER)/libtkimgjpeg142.a \ - ../../lib/Img$(TKIMGVER)/libjpegtcl84.a \ - ../../lib/Img$(TKIMGVER)/libtkimggif142.a \ - ../../lib/Img$(TKIMGVER)/libtkimgwindow142.a \ - ../../lib/Img$(TKIMGVER)/zlibtcl128.a \ - ../../lib/Img$(TKIMGVER)/libtkimg142.a \ - ../../lib/libxpa.a \ - ../../lib/tkblt$(TKBLTVER)/libtkbltstub32.a \ - ../../lib/tkblt$(TKBLTVER)/tkblt32.a \ - ../../lib/tkwin$(TKWINVER)/tkwin10.a \ - ../../lib/libxml2.a \ - ../../lib/libz.a - -APPDIR = ../../bin/ds9app + $(libdir)/tksao$(TKSAOVER)/tksao10.a \ + $(libdir)/libfuntools.a \ + $(libdir)/libast.a \ + $(libdir)/libast_err.a \ + $(libdir)/libast_pal.a \ + $(libdir)/tksao$(TKSAOVER)/tksao10.a \ + $(libdir)/tkhtml1$(TKHTMLVER)/tkhtml110.a \ + $(libdir)/tkmpeg$(TKMPEGVER)/tkmpeg10.a \ + $(libdir)/Tclxml$(TCLXMLVER)/Tclxml32.a \ + $(libdir)/Tktable$(TKTABLEVER)/Tktable210.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgpng142.a \ + $(libdir)/Img$(TKIMGVER)/libpngtcl1412.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgtiff142.a \ + $(libdir)/Img$(TKIMGVER)/libtifftcl394.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgjpeg142.a \ + $(libdir)/Img$(TKIMGVER)/libjpegtcl84.a \ + $(libdir)/Img$(TKIMGVER)/libtkimggif142.a \ + $(libdir)/Img$(TKIMGVER)/libtkimgwindow142.a \ + $(libdir)/Img$(TKIMGVER)/zlibtcl128.a \ + $(libdir)/Img$(TKIMGVER)/libtkimg142.a \ + $(libdir)/libxpa.a \ + $(libdir)/tkblt$(TKBLTVER)/libtkbltstub32.a \ + $(libdir)/tkblt$(TKBLTVER)/tkblt32.a \ + $(libdir)/tkwin$(TKWINVER)/tkwin10.a \ + $(libdir)/libxml2.a \ + $(libdir)/libz.a + +APPDIR = $(bindir)/ds9app #--------------------------main @@ -97,13 +107,13 @@ winMain.o : winMain.c -DTK_LOCAL_APPINIT=SAOAppInit -DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook \ -c winMain.c -o $@ -winMain.c : ../../tk$(TCLVER)/win/winMain.c - cp ../../tk$(TCLVER)/win/winMain.c . +winMain.c : $(prefix)/tk$(TCLVER)/win/winMain.c + cp $(prefix)/tk$(TCLVER)/win/winMain.c . ds9.res.o: ds9.rc ds9.ico i686-w64-mingw32-windres -o $@ \ - --define STATIC_BUILD --include ../../tk$(TCLVER)/generic \ - --include ../../$(TCLDIR)/generic --include ../../tk$(TCLVER)/win/rc \ + --define STATIC_BUILD --include $(prefix)/tk$(TCLVER)/generic \ + --include $(prefix)/$(TCLDIR)/generic --include $(prefix)/tk$(TCLVER)/win/rc \ ds9.rc appdir : @@ -117,31 +127,31 @@ framework: cp -pr ../doc $(APPDIR)/. cp -pr ../cmaps $(APPDIR)/. cp -pr ../template $(APPDIR)/. - echo "pkg_mkIndex $(APPDIR)/library *.tcl; exit" | ../../bin/tclsh86s + echo "pkg_mkIndex $(APPDIR)/library *.tcl; exit" | $(bindir)/tclsh86s tcltk : - cp -pr ../../lib/tcl8 $(APPDIR)/. - cp -pr ../../lib/tcl8.6 $(APPDIR)/. - cp -pr ../../lib/tk8.6 $(APPDIR)/. + cp -pr $(prefix)/lib/tcl8 $(APPDIR)/. + cp -pr $(prefix)/lib/tcl8.6 $(APPDIR)/. + cp -pr $(prefix)/lib/tk8.6 $(APPDIR)/. tkblt : mkdir $(APPDIR)/tkblt - cp -p ../../tkblt/library/graph.tcl $(APPDIR)/tkblt/. - echo "pkg_mkIndex $(APPDIR)/tkblt *.tcl; exit" | ../../bin/tclsh86s + cp -p $(prefix)/tkblt/library/graph.tcl $(APPDIR)/tkblt/. + echo "pkg_mkIndex $(APPDIR)/tkblt *.tcl; exit" | $(bindir)/tclsh86s tcllib : - cp -pr ../../tcllib/modules/base64 $(APPDIR)/. - cp -pr ../../tcllib/modules/ftp $(APPDIR)/. - cp -pr ../../tcllib/modules/log $(APPDIR)/. - cp -pr ../../tcllib/modules/textutil $(APPDIR)/. - cp -pr ../../tcllib/modules/math $(APPDIR)/. + cp -pr $(prefix)/tcllib/modules/base64 $(APPDIR)/. + cp -pr $(prefix)/tcllib/modules/ftp $(APPDIR)/. + cp -pr $(prefix)/tcllib/modules/log $(APPDIR)/. + cp -pr $(prefix)/tcllib/modules/textutil $(APPDIR)/. + cp -pr $(prefix)/tcllib/modules/math $(APPDIR)/. tkcon : mkdir $(APPDIR)/tkcon - cp -p ../../tkcon/*.tcl $(APPDIR)/tkcon/. + cp -p $(prefix)/tkcon/*.tcl $(APPDIR)/tkcon/. xpa : - cp -p ../../bin/xpans.exe $(APPDIR)/. + cp -p $(bindir)/xpans.exe $(APPDIR)/. cleanup: cd $(APPDIR); find . -depth -name CVS -exec rm -rf {} \; -- cgit v0.12 From 5fd274363c85d850eaeb3d36931b0123e2d41ef2 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 14:13:13 -0500 Subject: update config vars --- win/configure | 2 -- win/configure.in | 2 -- 2 files changed, 4 deletions(-) diff --git a/win/configure b/win/configure index c0959b5..3ccfedb 100755 --- a/win/configure +++ b/win/configure @@ -1859,10 +1859,8 @@ ARCH=$with_arch prefix=$ac_pwd - exec_prefix=$ac_pwd - CORES=`grep -c ^processor /proc/cpuinfo` diff --git a/win/configure.in b/win/configure.in index 25074c1..f9d1de7 100755 --- a/win/configure.in +++ b/win/configure.in @@ -42,9 +42,7 @@ ARCH=$with_arch AC_SUBST(ARCH) prefix=$ac_pwd -AC_SUBST(prefix) exec_prefix=$ac_pwd -AC_SUBST(exec_prefix) CORES=`grep -c ^processor /proc/cpuinfo` AC_SUBST(CORES) -- cgit v0.12 From ada1e356d94004bff54759f272fe76505c9c7856 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 14:14:15 -0500 Subject: new config vars --- macosx/configure | 2 -- macosx/configure.in | 2 -- 2 files changed, 4 deletions(-) diff --git a/macosx/configure b/macosx/configure index bf983be..d8b6939 100755 --- a/macosx/configure +++ b/macosx/configure @@ -1859,10 +1859,8 @@ ARCH=$with_arch prefix=$ac_pwd - exec_prefix=$ac_pwd - CORES=`sysctl -n "hw.ncpu"` diff --git a/macosx/configure.in b/macosx/configure.in index b2aa4b8..e58c3c2 100755 --- a/macosx/configure.in +++ b/macosx/configure.in @@ -42,9 +42,7 @@ ARCH=$with_arch AC_SUBST(ARCH) prefix=$ac_pwd -AC_SUBST(prefix) exec_prefix=$ac_pwd -AC_SUBST(exec_prefix) CORES=`sysctl -n "hw.ncpu"` AC_SUBST(CORES) -- cgit v0.12 From e1fe074d1518df1cde6862039c37e7360c0bd530 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 14:24:23 -0500 Subject: new config vars --- unix/configure | 2 -- unix/configure.in | 2 -- 2 files changed, 4 deletions(-) diff --git a/unix/configure b/unix/configure index e2dbd89..f02af08 100755 --- a/unix/configure +++ b/unix/configure @@ -1861,11 +1861,9 @@ ARCH=$with_arch prefix=$ac_pwd - exec_prefix=$ac_pwd - { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5 $as_echo_n "checking system version... " >&6; } if ${tcl_cv_sys_version+:} false; then : diff --git a/unix/configure.in b/unix/configure.in index a9d43c4..3de3b0c 100755 --- a/unix/configure.in +++ b/unix/configure.in @@ -42,9 +42,7 @@ ARCH=$with_arch AC_SUBST(ARCH) prefix=$ac_pwd -AC_SUBST(prefix) exec_prefix=$ac_pwd -AC_SUBST(exec_prefix) TEA_CONFIG_SYSTEM -- cgit v0.12 From cb68cb0a253cc23749d1369ba575f86576aab27d Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 14:38:17 -0500 Subject: new config vars --- macosx/Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/macosx/Makefile.in b/macosx/Makefile.in index 33f9d05..8452b55 100644 --- a/macosx/Makefile.in +++ b/macosx/Makefile.in @@ -15,7 +15,7 @@ JOBS = @CORES@ WITHTCL =--with-tcl=$(prefix)/build/tcl/Development WITHTK =--with-tk=$(prefix)/build/tk/Development $(WITHTCL) -CACHE =--config-cache --cache-file=../config.cache +CACHE =--config-cache --cache-file=$(prefix)/config.cache include ./make.include @@ -69,7 +69,7 @@ tcl$(TCLVER)/macosx/Makefile : ./configure \ --enable-64bit \ --enable-symbols \ - --config-cache --cache-file=../../config.cache + --config-cache --cache-file=$(prefix)/config.cache tk : tk$(TCLVER)/macosx/Makefile @echo "" @@ -94,7 +94,7 @@ tk$(TCLVER)/macosx/Makefile : $(WITHTCL) \ --enable-64bit \ --enable-symbols \ - --config-cache --cache-file=../config.cache + --config-cache --cache-file=$(prefix)/config.cache tkmacosx: tkmacosx/Makefile @echo "" @@ -109,7 +109,7 @@ tkmacosx/Makefile : $(WITHTK) \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ - --config-cache --cache-file=../config.cache + --config-cache --cache-file=$(prefix)/config.cache #--------------------------clean -- cgit v0.12 From 1a1c0cb0f409d78b88594d34960c8aaa13906802 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 14:40:00 -0500 Subject: new config vars --- unix/Makefile.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index 29a4ac8..b2bbae8 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -17,7 +17,7 @@ JOBS = @CORES@ WITHTCL =--with-tcl=$(prefix)/tcl$(TCLVER)/unix WITHTK =--with-tk=$(prefix)/tk$(TCLVER)/unix $(WITHTCL) -CACHE =--config-cache --cache-file=../config.cache +CACHE =--config-cache --cache-file=$(prefix)/config.cache include ./make.include @@ -44,7 +44,7 @@ tcl$(TCLVER)/unix/Makefile : ./configure \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ - --config-cache --cache-file=../../config.cache + --config-cache --cache-file=$(prefix)/config.cache tk : tk$(TCLVER)/unix/Makefile @echo "" @@ -59,7 +59,7 @@ tk$(TCLVER)/unix/Makefile : $(TKFLAGS) \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared --enable-symbols \ - --config-cache --cache-file=../../config.cache + --config-cache --cache-file=$(prefix)/config.cache #--------------------------clean @@ -78,5 +78,5 @@ tkunixdistclean : .PHONY : dist dist : - cd bin; tar cvf - ds9* | gzip > ../dist/ds9.$(ARCH).$(DS9VERSION).tar.gz - cd bin; tar cvf - xpa* | gzip > ../dist/xpa.$(ARCH).$(XPAVERSION).tar.gz + cd bin; tar cvf - ds9* | gzip > $(prefix)/dist/ds9.$(ARCH).$(DS9VERSION).tar.gz + cd bin; tar cvf - xpa* | gzip > $(prefix)/dist/xpa.$(ARCH).$(XPAVERSION).tar.gz -- cgit v0.12 From 114f3c8969ba218e6dbd618a42342f60f4877423 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 14:58:51 -0500 Subject: fix dirs --- make.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.include b/make.include index f33d0d7..a04a918 100644 --- a/make.include +++ b/make.include @@ -2,7 +2,7 @@ include ./make.pkgs #-------------------------- dirs -DIRS = $(bindir) $(libdir) $(includedir) $(mandir) $(datadir) dist +DIRS = $(bindir) $(libdir) $(includedir) $(datadir) $(mandir) dist #-------------------------- cvs stuff -- cgit v0.12 From 35a18523183a558d22c45f433f02c64f3084cca1 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 15:29:51 -0500 Subject: update config vars --- win/Makefile.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/win/Makefile.in b/win/Makefile.in index b0b23b1..a7e8b9d 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -21,7 +21,7 @@ TCLXMLFLAGS =--with-xml-static=yes TARGET =--build=x86_64-unknown-mingw32 WITHTCL =--with-tcl=$(prefix)/tcl$(TCLVER)/win WITHTK =--with-tk=$(prefix)/tk$(TCLVER)/win $(WITHTCL) -CACHE =--config-cache --cache-file=../config.cache +CACHE =--config-cache --cache-file=$(prefix)/config.cache include ./make.include @@ -52,7 +52,7 @@ tcl$(TCLVER)/win/Makefile : ./configure \ --prefix $(prefix) --exec-prefix $(exec_prefix) --libdir $(libdir) \ --disable-shared \ - --config-cache --cache-file=../../config.cache + --config-cache --cache-file=$(prefix)/config.cache tk : tk$(TCLVER)/win/Makefile @echo "" @@ -82,7 +82,7 @@ tkwin/Makefile : $(WITHTK) \ --prefix $(prefix) --exec-prefix $(exec_prefix) \ --disable-shared --enable-symbols \ - --config-cache --cache-file=../../config.cache + --config-cache --cache-file=$(prefix)/config.cache libxml2 : libxml2/win32/config.mingw @echo "" @@ -90,7 +90,7 @@ libxml2 : libxml2/win32/config.mingw $(MAKE) -C libxml2/win32 -j $(JOBS) -f Makefile.mingw dep $(MAKE) -C libxml2/win32 -j $(JOBS) -f Makefile.mingw libxmla $(MAKE) -C libxml2/win32 -j $(JOBS) -f Makefile.mingw install-libsa - cp libxml2/win32/xml2-config $(exec_prefix)/bin + cp libxml2/win32/xml2-config $(bindir) libxml2/win32/config.mingw : @echo "" @@ -105,7 +105,7 @@ libxslt : libxslt/win32/config.mingw $(MAKE) -C libxslt/win32 -j $(JOBS) -f Makefile.mingw libxslta $(MAKE) -C libxslt/win32 -j $(JOBS) -f Makefile.mingw libexslta $(MAKE) -C libxslt/win32 -j $(JOBS) -f Makefile.mingw install-libsa - cp libxslt/win32/xslt-config $(exec_prefix)/bin + cp libxslt/win32/xslt-config $(bindir) libxslt/win32/config.mingw : @echo "" -- cgit v0.12 From 646a9fb91bbfd118384447e5e2d59b5ee761a835 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 15:32:03 -0500 Subject: update config vars --- make.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.include b/make.include index a04a918..5ab4e64 100644 --- a/make.include +++ b/make.include @@ -2,7 +2,7 @@ include ./make.pkgs #-------------------------- dirs -DIRS = $(bindir) $(libdir) $(includedir) $(datadir) $(mandir) dist +DIRS = $(bindir) $(libdir) $(includedir) man dist #-------------------------- cvs stuff -- cgit v0.12 From c5243ac5f8509139545deb68a71b153e5e025c01 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 16:08:53 -0500 Subject: update config vars --- make.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.include b/make.include index 5ab4e64..13e42ff 100644 --- a/make.include +++ b/make.include @@ -2,7 +2,7 @@ include ./make.pkgs #-------------------------- dirs -DIRS = $(bindir) $(libdir) $(includedir) man dist +DIRS = $(bindir) $(libdir) $(includedir) $(datadir) man dist #-------------------------- cvs stuff -- cgit v0.12 From 9ca4da66863b53beb50ad29ed5aa23108c627da7 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 29 Dec 2016 16:19:53 -0500 Subject: update config vars --- ds9/doc/release/r7.0.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ds9/doc/release/r7.0.html b/ds9/doc/release/r7.0.html index e21074c..5a66575 100644 --- a/ds9/doc/release/r7.0.html +++ b/ds9/doc/release/r7.0.html @@ -735,6 +735,8 @@
  • 11.10.2016 MAGNIFIER: added check to prevent a SEGV in rare cases.
  • 11.15.2016 GUI: added check for bad "tk scaling" command results, which can occur with high resolution monitors.
  • 12.15.2016 RELEASE version 7.5
    • +
  • 12.28.2016 BUILD: now builds properly on OpenSUSE.
    • +
  • 12.29.2016 BUILD: cleanup configure/Makefile files.
  • xx.xx.2017 RELEASE version 7.6b1
    • -- cgit v0.12