summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2016-12-29 20:29:51 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2016-12-29 20:29:51 (GMT)
commit35a18523183a558d22c45f433f02c64f3084cca1 (patch)
treeee9e238cdd7b979483e6c624e69555ac77d3f336 /win
parent07b8c9fcb1fb9649eed52b7460b21af659fdee1a (diff)
downloadblt-35a18523183a558d22c45f433f02c64f3084cca1.zip
blt-35a18523183a558d22c45f433f02c64f3084cca1.tar.gz
blt-35a18523183a558d22c45f433f02c64f3084cca1.tar.bz2
update config vars
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in10
1 files 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 ""