support to calculate BUILDTOP in makeaclocals

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

52 files changed, 52 insertions, 23 deletions

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 50f139975..d2fbf83ab 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
diff --git a/src/lib/configure.in b/src/lib/configure.in
index 876f490e2..6171722a8 100644
--- a/src/lib/configure.in
+++ b/src/lib/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_DIRS(krb5 kdb des425 krb425 crypto gssapi)
 AC_PROG_ARCHIVE
 AC_PROG_RANLIB
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 70026ab49..fe1946e95 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -16,7 +17,6 @@ RM = rm -f
 CP = cp
 RANLIB = @RANLIB@
 
-BUILDTOP = ../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 OBJS=	cryptoconf.o
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index dd05b0eb9..9f81e7cf2 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_DIRS(des crc32 md4 md5 os)
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index c2c88a4ef..7f9cf8f88 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/crypto/crc32/configure.in b/src/lib/crypto/crc32/configure.in
index 184c6f447..cc5e8f0b7 100644
--- a/src/lib/crypto/crc32/configure.in
+++ b/src/lib/crypto/crc32/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index f8a3ffc9a..5ee98d937 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in
index 184c6f447..cc5e8f0b7 100644
--- a/src/lib/crypto/des/configure.in
+++ b/src/lib/crypto/des/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 04e56f404..0e758dd51 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in
index 184c6f447..cc5e8f0b7 100644
--- a/src/lib/crypto/md4/configure.in
+++ b/src/lib/crypto/md4/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index ff2571bb8..a8c5a1c3c 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in
index 184c6f447..cc5e8f0b7 100644
--- a/src/lib/crypto/md5/configure.in
+++ b/src/lib/crypto/md5/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 86ca11ee5..646883479 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -15,7 +16,6 @@ LN = @LN_S@
 
 LIBOBJS = @LIBOBJS@
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/crypto/os/configure.in b/src/lib/crypto/os/configure.in
index f7d18016d..49a6c8228 100644
--- a/src/lib/crypto/os/configure.in
+++ b/src/lib/crypto/os/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 0c436341a..f9ee53cfb 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 RANLIB = @RANLIB@
 ARCHIVE = @ARCHIVE@
 ARADD = @ARADD@
@@ -16,7 +17,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index f0cb91d40..504b0c78b 100644
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 02f3bb2fe..136857964 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index 7522785d7..21c964609 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_DIRS(generic krb5)
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index d64446427..bc2359ecb 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -14,7 +15,6 @@ CP = cp
 
 AWK = @AWK@
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in
index fe09467ca..3e74e536c 100644
--- a/src/lib/gssapi/generic/configure.in
+++ b/src/lib/gssapi/generic/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 ET_RULES
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index b748bab75..7a6e82a3d 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -14,7 +15,6 @@ CP = cp
 
 AWK = @AWK@
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in
index 0843821e4..e5f2f6ede 100644
--- a/src/lib/gssapi/krb5/configure.in
+++ b/src/lib/gssapi/krb5/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 ET_RULES
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 1870b3a9e..369a8c71c 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 RANLIB = @RANLIB@
 ARCHIVE = @ARCHIVE@
 ARADD = @ARADD@
@@ -14,7 +15,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 576db04b2..fd132bd5c 100644
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
diff --git a/src/lib/krb425/Makefile.in b/src/lib/krb425/Makefile.in
index a5c0e8702..c5b3ac250 100644
--- a/src/lib/krb425/Makefile.in
+++ b/src/lib/krb425/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 RANLIB = @RANLIB@
 ARCHIVE = @ARCHIVE@
 ARADD = @ARADD@
@@ -18,7 +19,6 @@ CP = cp
 
 AWK = @AWK@
 
-BUILDTOP = ../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: krb_err.h includes $(OBJS)
diff --git a/src/lib/krb425/configure.in b/src/lib/krb425/configure.in
index 58ec1c066..f414b745d 100644
--- a/src/lib/krb425/configure.in
+++ b/src/lib/krb425/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 ET_RULES
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 4da82a904..c8e03d64a 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index ee4ff4600..c0a86e5a4 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -11,7 +12,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 
 PEPSY = @PEPSY@
 PSYFLAGS = @PSYFLAGS@
diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in
index 2cf4f07ff..5dc1c4e95 100644
--- a/src/lib/krb5/asn.1/configure.in
+++ b/src/lib/krb5/asn.1/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 UsePepsy
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index b8f12a336..a2a1deb80 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in
index c3f602750..aae14229c 100644
--- a/src/lib/krb5/ccache/configure.in
+++ b/src/lib/krb5/ccache/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_DIRS(file stdio)
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index 9050efd87..4042d5c98 100644
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -10,7 +11,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in
index 184c6f447..cc5e8f0b7 100644
--- a/src/lib/krb5/ccache/file/configure.in
+++ b/src/lib/krb5/ccache/file/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in
index e7acee5fd..4d30ca41c 100644
--- a/src/lib/krb5/ccache/stdio/Makefile.in
+++ b/src/lib/krb5/ccache/stdio/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -10,7 +11,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in
index 184c6f447..cc5e8f0b7 100644
--- a/src/lib/krb5/ccache/stdio/configure.in
+++ b/src/lib/krb5/ccache/stdio/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 5e8349336..33b71b310 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_DIRS(error_tables asn.1 ccache keytab krb rcache free os posix)
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 7ce525c1b..7be230d09 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
  
@@ -12,7 +13,6 @@ CP = cp
 
 AWK = @AWK@
 
-BUILDTOP = ../../..
 
 EHDRDIR=$(BUILDTOP)/include/krb5
 
diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in
index de80b5a78..0043f2a55 100644
--- a/src/lib/krb5/error_tables/configure.in
+++ b/src/lib/krb5/error_tables/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 ET_RULES
 SS_RULES
 CONFIG_RULES
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index c1f65c67c..fde268cbe 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/free/configure.in b/src/lib/krb5/free/configure.in
index 465abd0b2..ceccb7221 100644
--- a/src/lib/krb5/free/configure.in
+++ b/src/lib/krb5/free/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 48f0cca84..3c9fab608 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in
index f95f46243..6e557cb1f 100644
--- a/src/lib/krb5/keytab/configure.in
+++ b/src/lib/krb5/keytab/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_DIRS(file)
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index cacaedb2a..8f2cead56 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -10,7 +11,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in
index 184c6f447..cc5e8f0b7 100644
--- a/src/lib/krb5/keytab/file/configure.in
+++ b/src/lib/krb5/keytab/file/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 56990f917..70ef54732 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in
index 3f298de95..09b8861b8 100644
--- a/src/lib/krb5/krb/configure.in
+++ b/src/lib/krb5/krb/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 893cfd417..33d5ee341 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -10,7 +11,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index 465abd0b2..ceccb7221 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index 26eb2ead7..fa76077e0 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in
index 9400c463a..8afcc40ba 100644
--- a/src/lib/krb5/posix/configure.in
+++ b/src/lib/krb5/posix/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 615727459..baa147f98 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -1,3 +1,4 @@
+BUILDTOP=@BUILDTOP@
 SUBDIRS = @SUBDIRS@
 
 srcdir = @srcdir@
@@ -12,7 +13,6 @@ LDFLAGS = -g
 RM = rm -f
 CP = cp
 
-BUILDTOP = ../../..
 SRCTOP = $(srcdir)/$(BUILDTOP)
 
 all:: $(OBJS)
diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in
index 465abd0b2..ceccb7221 100644
--- a/src/lib/krb5/rcache/configure.in
+++ b/src/lib/krb5/rcache/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE