support to calculate BUILDTOP in makeaclocals

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3861 dc483132-0cff-0310-8789-dd5450dbe970

12 files changed, 26 insertions, 19 deletions

diff --git a/src/isode/Makefile.in b/src/isode/Makefile.in
index 47706e8ff..da06aeb5b 100644
--- a/src/isode/Makefile.in
+++ b/src/isode/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
diff --git a/src/isode/compat/Makefile.in b/src/isode/compat/Makefile.in
index 7241ca8cf..a76fd57e9 100644
--- a/src/isode/compat/Makefile.in
+++ b/src/isode/compat/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 ###############################################################################
 #   Instructions to Make, for compilation of UNIX compatibility library
 ###############################################################################
@@ -5,8 +6,7 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-BUILDTOP = ../../
-TOPDIR = $(BUILDTOP)
+TOPDIR = $(BUILDTOP)/
 
 OPTIONS	=	-I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) 
@@ -16,7 +16,7 @@ ISODEINCM=	$(KRBINC)isode
 ISODEINC=	$(ISODEINCM)/
 
 HDIR	=	$(TOPDIR)isode/h/
-UTILDIR	=	$(srcdir)/$(BUILDTOP)isode/util/
+UTILDIR	=	$(srcdir)/$(TOPDIR)isode/util/
 INCDIRM	=	$(HDIR)
 INCDIR	=	$(INCDIRM)/
 PEPSYDIRM=	$(INCDIR)pepsy
diff --git a/src/isode/compat/configure.in b/src/isode/compat/configure.in
index 0159192e5..b18ba0dd7 100644
--- a/src/isode/compat/configure.in
+++ b/src/isode/compat/configure.in
@@ -1,3 +1,4 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 AC_REPLACE_FUNCS(strdup)
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/isode/configure.in b/src/isode/configure.in
index 2ef53dd99..d98e89727 100644
--- a/src/isode/configure.in
+++ b/src/isode/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_DIRS(h compat psap pepsy support)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
diff --git a/src/isode/h/Makefile.in b/src/isode/h/Makefile.in
index 92e3b1baa..2390c5e8f 100644
--- a/src/isode/h/Makefile.in
+++ b/src/isode/h/Makefile.in
@@ -1,11 +1,11 @@
+BUILDTOP=@BUILDTOP@
 ###############################################################################
 #   Instructions to Make, for compilation of ISODE header files
 ###############################################################################
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-BUILDTOP = ../../
-TOPDIR = $(BUILDTOP)
+TOPDIR = $(BUILDTOP)/
 
 OPTIONS	=	-I. -I$(HDIR) $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) 
diff --git a/src/isode/h/configure.in b/src/isode/h/configure.in
index cdff2db09..1ffff33fd 100644
--- a/src/isode/h/configure.in
+++ b/src/isode/h/configure.in
@@ -1,2 +1,3 @@
 AC_INIT(configure.in)
-AC_OUTPUT(Makefile)
+AC_SET_BUILDTOP
+AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in
index 2f98140b8..0b7db0f2a 100644
--- a/src/isode/pepsy/Makefile.in
+++ b/src/isode/pepsy/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 ###############################################################################
 #   Instructions to Make, for compilation of ISODE PEPSY process
 ###############################################################################
@@ -6,14 +7,13 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 DEFS = @DEFS@
 
-BUILDTOP = ../../
-TOPDIR = $(BUILDTOP)
+TOPDIR = $(BUILDTOP)/
 
 OPTIONS	=	-I. -I$(HDIR) -I$(TOPDIR)include $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) $(DEFS)
 
 HDIR	=	$(srcdir)/$(TOPDIR)isode/h/
-UTILDIR	=	$(srcdir)/$(BUILDTOP)isode/util/
+UTILDIR	=	$(srcdir)/$(TOPDIR)isode/util/
 INCDIRM	=	$(HDIR)
 INCDIR	=	$(INCDIRM)/
 PEPSYDIRM=	$(INCDIR)pepsy
diff --git a/src/isode/pepsy/configure.in b/src/isode/pepsy/configure.in
index 3f73b8465..56a3b8c2a 100644
--- a/src/isode/pepsy/configure.in
+++ b/src/isode/pepsy/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 AC_PROG_LEX
 AC_YYTEXT_POINTER
 HAVE_YYLINENO
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/isode/psap/Makefile.in b/src/isode/psap/Makefile.in
index 73c43255f..c13f7564b 100644
--- a/src/isode/psap/Makefile.in
+++ b/src/isode/psap/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 ###############################################################################
 #   Instructions to Make, for compilation of ISODE PSAP processes
 ###############################################################################
@@ -5,8 +6,7 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-BUILDTOP = ../../
-TOPDIR = $(BUILDTOP)
+TOPDIR = $(BUILDTOP)/
 LIBDIR	=	$(TOPDIR)lib/
 
 OPTIONS	=	-I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT)
@@ -17,7 +17,7 @@ ISODEINCM=	$(KRBINC)isode
 ISODEINC=	$(ISODEINCM)/
 
 HDIR	=	$(TOPDIR)isode/h/
-UTILDIR	=	$(srcdir)/$(BUILDTOP)isode/util/
+UTILDIR	=	$(srcdir)/$(TOPDIR)isode/util/
 INCDIRM	=	$(HDIR)
 INCDIR	=	$(INCDIRM)/
 PEPSYDIRM=	$(INCDIR)pepsy
diff --git a/src/isode/psap/configure.in b/src/isode/psap/configure.in
index c7b4a2bbc..191ca7526 100644
--- a/src/isode/psap/configure.in
+++ b/src/isode/psap/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(nsl)
 AC_HAVE_LIBRARY(socket)
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/isode/support/Makefile.in b/src/isode/support/Makefile.in
index 807ed167d..6d6df306e 100644
--- a/src/isode/support/Makefile.in
+++ b/src/isode/support/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 ###############################################################################
 #   Instructions to Make, for compilation of ISODE support processes
 ###############################################################################
@@ -5,14 +6,13 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-BUILDTOP = ../../
-TOPDIR = $(BUILDTOP)
+TOPDIR = $(BUILDTOP)/
 
 OPTIONS	=	-I. -I$(HDIR) $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) 
 
 HDIR	=	$(srcdir)/$(TOPDIR)isode/h/
-UTILDIR	=	$(srcdir)/$(BUILDTOP)isode/util/
+UTILDIR	=	$(srcdir)/$(TOPDIR)isode/util/
 INCDIRM	=	$(HDIR)
 INCDIR	=	$(INCDIRM)/
 PEPSYDIRM=	$(INCDIR)pepsy
diff --git a/src/isode/support/configure.in b/src/isode/support/configure.in
index cdff2db09..1ffff33fd 100644
--- a/src/isode/support/configure.in
+++ b/src/isode/support/configure.in
@@ -1,2 +1,3 @@
 AC_INIT(configure.in)
-AC_OUTPUT(Makefile)
+AC_SET_BUILDTOP
+AC_OUTPUT(Makefile,[EXTRA_RULES])