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