From 574ccc34f9a00b7386553680fb7eac5059d644d1 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
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