Have the makefiles support explicit target directories properly, courtesy wthrowe@mit.edu

13 files changed, 36 insertions, 36 deletions

diff --git a/Makefile.in b/Makefile.in
index c7b438c..ddf58f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,10 +7,10 @@ sysconfdir=@sysconfdir@
 sbindir=@sbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
+bindir=@bindir@
+libdir=@libdir@
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
diff --git a/clients/zaway/Makefile.in b/clients/zaway/Makefile.in
index bff534d..241db97 100644
--- a/clients/zaway/Makefile.in
+++ b/clients/zaway/Makefile.in
@@ -9,10 +9,10 @@ lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 top_builddir=../..
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
diff --git a/clients/zctl/Makefile.in b/clients/zctl/Makefile.in
index 3701e56..3253a9a 100644
--- a/clients/zctl/Makefile.in
+++ b/clients/zctl/Makefile.in
@@ -8,10 +8,10 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 top_builddir=../..
 
 srcdir=@srcdir@
diff --git a/clients/zleave/Makefile.in b/clients/zleave/Makefile.in
index 027fdc4..99234df 100644
--- a/clients/zleave/Makefile.in
+++ b/clients/zleave/Makefile.in
@@ -8,10 +8,10 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 top_builddir=../..
 
 srcdir=@srcdir@
diff --git a/clients/zlocate/Makefile.in b/clients/zlocate/Makefile.in
index 62dae50..c3da9eb 100644
--- a/clients/zlocate/Makefile.in
+++ b/clients/zlocate/Makefile.in
@@ -8,10 +8,10 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 top_builddir=../..
 
 srcdir=@srcdir@
diff --git a/clients/znol/Makefile.in b/clients/znol/Makefile.in
index 1320f88..ef7d128 100644
--- a/clients/znol/Makefile.in
+++ b/clients/znol/Makefile.in
@@ -8,10 +8,10 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 top_builddir=../..
 
 srcdir=@srcdir@
diff --git a/clients/zshutdown_notify/Makefile.in b/clients/zshutdown_notify/Makefile.in
index 87bdb36..4c12649 100644
--- a/clients/zshutdown_notify/Makefile.in
+++ b/clients/zshutdown_notify/Makefile.in
@@ -8,10 +8,10 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 top_builddir=../..
 
 srcdir=@srcdir@
diff --git a/clients/zstat/Makefile.in b/clients/zstat/Makefile.in
index 368bdb7..dae7ace 100644
--- a/clients/zstat/Makefile.in
+++ b/clients/zstat/Makefile.in
@@ -8,10 +8,10 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 top_builddir=../..
 
 srcdir=@srcdir@
diff --git a/clients/zwrite/Makefile.in b/clients/zwrite/Makefile.in
index 64108e9..8b695ac 100644
--- a/clients/zwrite/Makefile.in
+++ b/clients/zwrite/Makefile.in
@@ -8,10 +8,10 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 top_builddir=../..
 
 srcdir=@srcdir@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index cbdb9e3..1b50001 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -9,9 +9,9 @@ lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 top_builddir=..
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 LIBS=@LIBS@
 
 srcdir=@srcdir@
diff --git a/server/Makefile.in b/server/Makefile.in
index 0f6eb73..58b8f78 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -8,9 +8,9 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 top_builddir=..
 
 srcdir=@srcdir@
diff --git a/zhm/Makefile.in b/zhm/Makefile.in
index 0dcdcc9..04268a8 100644
--- a/zhm/Makefile.in
+++ b/zhm/Makefile.in
@@ -8,9 +8,9 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 top_builddir=..
 
 srcdir=@srcdir@
diff --git a/zwgc/Makefile.in b/zwgc/Makefile.in
index 6addf6a..86fd3be 100644
--- a/zwgc/Makefile.in
+++ b/zwgc/Makefile.in
@@ -8,10 +8,10 @@ sbindir=@sbindir@
 lsbindir=@lsbindir@
 datarootdir=@datarootdir@
 
-includedir=${prefix}/include
+includedir=@includedir@
 mandir=@mandir@
-libdir=${exec_prefix}/lib
-bindir=${exec_prefix}/bin
+libdir=@libdir@
+bindir=@bindir@
 top_builddir=..
 
 srcdir=@srcdir@