Mass makefile/configure.in build system revamp

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

44 files changed, 154 insertions, 39 deletions

diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog
index 708b53b..dc6accc 100644
--- a/src/appl/ChangeLog
+++ b/src/appl/ChangeLog
@@ -1,3 +1,12 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and
+		remove use of DO_SUBDIRS.
+
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Mon Nov 18 20:57:08 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* configure.in: Remove the popper, mailquery, and movemail
diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 16fdba5..37ad0fe 100644
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -1 +1,3 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 CFLAGS = $(CCOPTS)
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 3beb9cf..0dbf84b 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Jan 20 21:42:06 1998  Tom Yu  <tlyu@mit.edu>
 
 	* krlogind.c (protocol): Declare pibuf and fibuf as being BUFSIZ
diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 368ceb8..9ea3cb7 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES)
 LOCALINCLUDE=@KRB4_INCLUDES@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/configure.in b/src/appl/configure.in
index 8622fa9..54e2af3 100644
--- a/src/appl/configure.in
+++ b/src/appl/configure.in
@@ -1,5 +1,4 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(sample simple user_user bsd gss-sample gssftp telnet)
-DO_SUBDIRS
+AC_CONFIG_SUBDIRS(sample simple user_user bsd gss-sample gssftp telnet)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 8bdd01d..893ff88 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Thu Sep 18 17:52:26 1997  Tom Yu  <tlyu@mit.edu>
 
 	* configure.in: Replace USE_STRING_H with something more sane.
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index 948b83e..ee16300 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/gssftp/ChangeLog b/src/appl/gssftp/ChangeLog
index ea47f84..86fe377 100644
--- a/src/appl/gssftp/ChangeLog
+++ b/src/appl/gssftp/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and
+		remove use of DO_SUBDIRS.
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Jan 14 03:19:55 1996  Mark Eichin  <eichin@cygnus.com>
 
 	* README.gssftp: new file, documents history of this implementation.
diff --git a/src/appl/gssftp/Makefile.in b/src/appl/gssftp/Makefile.in
index 76388e8..89ff07c 100644
--- a/src/appl/gssftp/Makefile.in
+++ b/src/appl/gssftp/Makefile.in
@@ -1,2 +1,4 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS)
 LDFLAGS = -g
diff --git a/src/appl/gssftp/configure.in b/src/appl/gssftp/configure.in
index 373180b..11fa91a 100644
--- a/src/appl/gssftp/configure.in
+++ b/src/appl/gssftp/configure.in
@@ -1,5 +1,4 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(ftp ftpd)
-DO_SUBDIRS
+AC_CONFIG_SUBDIRS(ftp ftpd)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 2e42d57..8c3c1a8 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Thu Jan 29 19:39:27 1998  Dan Winship  <danw@mit.edu>
 
 	* ftp.h:
diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index e292780..5e971b1 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 #
 # appl/gssftp/ftp/Makefile.in
 #
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 18377bb..da05409 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Fri Feb  6 13:25:28 1998  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* popen.c (ftpd_popen): Make sure you can't overrun the argv[] and
diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index 303ae80..a237964 100644
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 #
 # appl/gssftp/ftpd/Makefile.in
 #
diff --git a/src/appl/sample/ChangeLog b/src/appl/sample/ChangeLog
index b4b4f50..847b6da 100644
--- a/src/appl/sample/ChangeLog
+++ b/src/appl/sample/ChangeLog
@@ -1,5 +1,13 @@
+Mon Feb  2 16:47:05 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
+	* configure.in: Create the makefiles for all of the subdirectories
+		and move all of the configure.in tests from the
+		subdirectories into this configure.in.
+	
 Fri Jul 7 15:45:38 EDT 1995	Paul Park	(pjpark@mit.edu)
+
 	* Makefile.in - Remove LDFLAGS.
 
 Fri Jun  9 18:27:34 1995    <tytso@rsx-11.mit.edu>
diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index 16fdba5..f3fd3c2 100644
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -1 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
+LOCAL_SUBDIRS = sclient sserver
+
 CFLAGS = $(CCOPTS)
diff --git a/src/appl/sample/configure.in b/src/appl/sample/configure.in
index 8a4b847..5bbd1ee 100644
--- a/src/appl/sample/configure.in
+++ b/src/appl/sample/configure.in
@@ -1,5 +1,11 @@
-AC_INIT(configure.in)
+AC_INIT(sample.h)
 CONFIG_RULES
-CONFIG_DIRS(sclient sserver)
-DO_SUBDIRS
-V5_AC_OUTPUT_MAKEFILE
+CONFIG_RULES
+AC_PROG_INSTALL
+AC_CHECK_HEADERS(stdlib.h)
+KRB5_BUILD_PROGRAM
+K5_GEN_MAKEFILE(.)
+K5_GEN_MAKEFILE(sclient)
+K5_GEN_MAKEFILE(sserver)
+K5_OUTPUT_FILES
+
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index afb3bd2..e7201b5 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Dec 16 09:43:15 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* sclient.c (main): Free client principal and krb5_ap_rep_enc_part
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 8763029..fc0506f 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
deleted file mode 100644
index 0a1fcf4..0000000
--- a/src/appl/sample/sclient/configure.in
+++ /dev/null
@@ -1,6 +0,0 @@
-AC_INIT(sclient.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_CHECK_HEADERS(stdlib.h)
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index 591aef5..48076d7 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Feb  4 20:47:55 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 5be42c2..7351718 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
deleted file mode 100644
index af0f45a..0000000
--- a/src/appl/sample/sserver/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(sserver.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/ChangeLog b/src/appl/simple/ChangeLog
index a2ae28f..3c69c21 100644
--- a/src/appl/simple/ChangeLog
+++ b/src/appl/simple/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb  2 16:47:05 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
+	* configure.in: Create the makefiles for all of the subdirectories
+		and move all of the configure.in tests from the
+		subdirectories into this configure.in.
+	
 Fri Sep 15 14:24:37 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* simple.h (SIMPLE_SERVICE, SIMPLE_PORT): Use separate definitions
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 16fdba5..5c3584f 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -1 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
+LOCAL_SUBDIRS = client server
+
 CFLAGS = $(CCOPTS)
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 7201759..794f419 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Feb 18 18:11:03 1997  Richard Basch  <basch@lehman.com>
 
 	* sim_client.c: Replace krb5_xfree with krb5_free_data_contents
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index f9f5303..104c2b4 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
deleted file mode 100644
index 3d81282..0000000
--- a/src/appl/simple/client/configure.in
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT(sim_client.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_CHECK_HEADERS(stdlib.h)
-if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then
-	AC_DEFINE(BROKEN_STREAMS_SOCKETS)
-fi
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/configure.in b/src/appl/simple/configure.in
index b155112..dc8492e 100644
--- a/src/appl/simple/configure.in
+++ b/src/appl/simple/configure.in
@@ -1,5 +1,14 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(client server)
-DO_SUBDIRS
-V5_AC_OUTPUT_MAKEFILE
+AC_PROG_INSTALL
+AC_CHECK_HEADERS(stdlib.h)
+if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then
+	AC_DEFINE(BROKEN_STREAMS_SOCKETS)
+fi
+KRB5_BUILD_PROGRAM
+K5_GEN_MAKEFILE(.)
+K5_GEN_MAKEFILE(client)
+K5_GEN_MAKEFILE(server)
+K5_OUTPUT_FILES
+
+
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index e6fd132..1a11f94 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Feb 18 18:12:16 1997  Richard Basch  <basch@lehman.com>
 
 	* sim_server.c: Use krb5_free_data_contents instead of krb5_xfree
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 332c266..e3118ea 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
deleted file mode 100644
index 61590e6..0000000
--- a/src/appl/simple/server/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(sim_server.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog
index 599cccf..3aa6a44 100644
--- a/src/appl/telnet/ChangeLog
+++ b/src/appl/telnet/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and
+		remove use of DO_SUBDIRS.
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Fri Jun  9 18:29:38 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/appl/telnet/Makefile.in b/src/appl/telnet/Makefile.in
index e69de29..d319fd7 100644
--- a/src/appl/telnet/Makefile.in
+++ b/src/appl/telnet/Makefile.in
@@ -0,0 +1,2 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in
index 1b90cbc..9dccb58 100644
--- a/src/appl/telnet/configure.in
+++ b/src/appl/telnet/configure.in
@@ -1,5 +1,4 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(libtelnet telnet telnetd)
-DO_SUBDIRS
+AC_CONFIG_SUBDIRS(libtelnet telnet telnetd)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index df22164..987b029 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,11 @@
+Thu Feb 12 10:23:28 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Remove obsolete USE_KRB4_LIBRARY macro
+
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Thu Nov 20 17:13:42 1997  Tom Yu  <tlyu@mit.edu>
 
 	* forward.c (rd_and_store_for_creds): Fix up to no longer do the
diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index 614531d..8ce5643 100644
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 # derived from the original Makefile.generic
 #
 # Copyright (c) 1991 The Regents of the University of California.
diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in
index 01cf5d7..b2bc50e 100644
--- a/src/appl/telnet/libtelnet/configure.in
+++ b/src/appl/telnet/libtelnet/configure.in
@@ -14,5 +14,4 @@ else
 	AC_MSG_RESULT(Kerberos 4 authentication enabled)
 	AC_DEFINE(KRB4)
 fi
-USE_KRB4_LIBRARY
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 73189bb..0b4848b 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Wed Feb 12 15:23:36 1997  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
 
 	* configure.in: Fix DES425_LIB... missed this in libhack_branch;
diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index ca7e743..9774601 100644
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 # derived from the original Makefile.generic
 #
 # Copyright (c) 1991 The Regents of the University of California.
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 31eaf8e..49f9bf0 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Wed Jan 28 17:21:08 1998  Dan Winship  <danw@mit.edu>
 
 	* telnetd.c (doit): additional fix for previous terminaltype change
diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index d3dcfca..2719cf0 100644
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 # derived from the original Makefile.generic
 #
 # Copyright (c) 1991 The Regents of the University of California.
diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index e6706b4..9c1e6f7 100644
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Tue Feb  4 20:35:45 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index fe2906a..e46e649 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)