diff options
| -rwxr-xr-x | ds9/win/Makefile.in | 102 | ||||
| -rw-r--r-- | win/Makefile.in | 28 | ||||
| -rwxr-xr-x | win/configure | 5 | ||||
| -rwxr-xr-x | win/configure.in | 6 |
4 files changed, 82 insertions, 59 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 {} \; 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) |