summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-03-08 07:20:55 +0000
committerKen Raeburn <raeburn@mit.edu>2004-03-08 07:20:55 +0000
commit39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d (patch)
treef90a60b8d27f5cf393d7578f5657b7999b90341d /src
parentfdd187e33062e403c0210f7844e7a12b68369023 (diff)
downloadkrb5-39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d.tar.gz
krb5-39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d.tar.xz
krb5-39faf762d23d16ccd1d6b7c9b1d2046f6b1b2d0d.zip
Change subdir processing so that SUBDIRS will contain the configured
subdirs only for the makefile in the directory with the configure script, and will have only $(LOCAL_SUBDIRS) elsewhere. Drop the use of "MY_SUBDIRS=." to override SUBDIRS in favor of this way of keeping SUBDIRS empty. Drop other uses of MY_SUBDIRS in favor of LOCAL_SUBDIRS or (in one case, the top level) overriding the SUBDIRS setting from pre.in. One less thing to keep tweaking as configure scripts get reorganized and merged. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16158 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in2
-rw-r--r--src/appl/ChangeLog4
-rw-r--r--src/appl/Makefile.in2
-rw-r--r--src/appl/gss-sample/ChangeLog4
-rw-r--r--src/appl/gss-sample/Makefile.in1
-rw-r--r--src/appl/sample/ChangeLog4
-rw-r--r--src/appl/sample/Makefile.in2
-rw-r--r--src/appl/sample/sclient/ChangeLog4
-rw-r--r--src/appl/sample/sclient/Makefile.in1
-rw-r--r--src/appl/sample/sserver/ChangeLog4
-rw-r--r--src/appl/sample/sserver/Makefile.in1
-rw-r--r--src/appl/simple/ChangeLog4
-rw-r--r--src/appl/simple/Makefile.in2
-rw-r--r--src/appl/simple/client/ChangeLog4
-rw-r--r--src/appl/simple/client/Makefile.in1
-rw-r--r--src/appl/simple/server/ChangeLog4
-rw-r--r--src/appl/simple/server/Makefile.in1
-rw-r--r--src/appl/user_user/ChangeLog4
-rw-r--r--src/appl/user_user/Makefile.in1
-rw-r--r--src/config-files/ChangeLog4
-rw-r--r--src/config-files/Makefile.in1
-rw-r--r--src/config/ChangeLog8
-rw-r--r--src/config/post.in6
-rw-r--r--src/config/pre.in5
-rw-r--r--src/gen-manpages/ChangeLog4
-rw-r--r--src/gen-manpages/Makefile.in1
-rw-r--r--src/include/ChangeLog4
-rw-r--r--src/include/Makefile.in2
-rw-r--r--src/include/kerberosIV/ChangeLog4
-rw-r--r--src/include/kerberosIV/Makefile.in1
-rw-r--r--src/include/krb5/ChangeLog4
-rw-r--r--src/include/krb5/Makefile.in1
-rw-r--r--src/kdc/ChangeLog4
-rw-r--r--src/kdc/Makefile.in1
-rw-r--r--src/krb524/ChangeLog4
-rw-r--r--src/krb524/Makefile.in1
-rw-r--r--src/lib/ChangeLog4
-rw-r--r--src/lib/Makefile.in2
-rw-r--r--src/slave/ChangeLog4
-rw-r--r--src/slave/Makefile.in1
-rw-r--r--src/util/ChangeLog4
-rw-r--r--src/util/Makefile.in2
-rw-r--r--src/util/send-pr/ChangeLog4
-rw-r--r--src/util/send-pr/Makefile.in1
-rw-r--r--src/windows/ms2mit/ChangeLog4
-rw-r--r--src/windows/ms2mit/Makefile.in1
47 files changed, 108 insertions, 28 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index add07d89fb..22ee3073da 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (SUBDIRS): Renamed from MY_SUBDIRS.
+
2004-03-07 Ken Raeburn <raeburn@mit.edu>
* aclocal.m4 (AC_KRB5_TCL_FIND_CONFIG): Look for tclConfig.sh in
diff --git a/src/Makefile.in b/src/Makefile.in
index fa8983410d..1918d0b038 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -3,7 +3,7 @@ datadir=@datadir@
thisconfigdir=.
myfulldir=.
mydir=.
-MY_SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
+SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
config-files gen-manpages
BUILDTOP=$(REL)$(C)
LOCALINCLUDES = -I$(srcdir)
diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog
index 265179e783..fb9776a92c 100644
--- a/src/appl/ChangeLog
+++ b/src/appl/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
2004-02-09 Ken Raeburn <raeburn@mit.edu>
* configure.in: Check for sys/time.h and time.h.
diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 9c8df958bb..2a7d80aea9 100644
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -3,5 +3,5 @@ myfulldir=appl
mydir=.
BUILDTOP=$(REL)..
-MY_SUBDIRS= sample simple user_user bsd gss-sample gssftp telnet
+LOCAL_SUBDIRS= sample simple user_user gss-sample
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index d3bf699826..b641880dba 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2003-02-26 Jeffrey Altman <jaltman@mit.edu>
* gss-client.c: merge if (this) if (that) into if (this && that)
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index e3d71af0f9..7ef17fde68 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./..
myfulldir=appl/gss-sample
mydir=gss-sample
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..
DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/sample/ChangeLog b/src/appl/sample/ChangeLog
index 5ba334d293..404dce1304 100644
--- a/src/appl/sample/ChangeLog
+++ b/src/appl/sample/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index b26fff2643..a580359e4a 100644
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -1,5 +1,5 @@
thisconfigdir=./..
myfulldir=appl/sample
mydir=sample
-MY_SUBDIRS = sclient sserver
+LOCAL_SUBDIRS = sclient sserver
BUILDTOP=$(REL)..$(S)..
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 9263c7a534..51a10942bd 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 6906bbf12c..868f678eb6 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./../..
myfulldir=appl/sample/sclient
mydir=sample/sclient
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index 838c0a33a9..902f203e3c 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 0f59b0af99..32e8864efa 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./../..
myfulldir=appl/sample/sserver
mydir=sample/sserver
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/simple/ChangeLog b/src/appl/simple/ChangeLog
index 80bba459b8..9c9da95696 100644
--- a/src/appl/simple/ChangeLog
+++ b/src/appl/simple/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index fb33754917..9e6f16da2e 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -1,5 +1,5 @@
thisconfigdir=./..
myfulldir=appl/simple
mydir=simple
-MY_SUBDIRS = client server
+LOCAL_SUBDIRS = client server
BUILDTOP=$(REL)..$(S)..
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 76c08d5597..29b95a64fe 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index e97c5fe102..c7023ca1d1 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./../..
myfulldir=appl/simple/client
mydir=simple/client
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index d6431aa335..67d2769e4b 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 1c405371f6..d670edaa72 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./../..
myfulldir=appl/simple/server
mydir=simple/server
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES= -I.. -I$(srcdir)/..
diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index 147d9c2939..308df58d1d 100644
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2003-01-10 Ken Raeburn <raeburn@mit.edu>
* server.c: Include port-sockets.h.
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 782311b44c..e55eda8a21 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./..
myfulldir=appl/user_user
mydir=user_user
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..
DEFINES = -DDEBUG
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog
index 502fc4b7d0..80d6a9b7f8 100644
--- a/src/config-files/ChangeLog
+++ b/src/config-files/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2003-06-27 Jen Selby <jenselby@mit.edu>
* kdc.conf.M: replaced the @LOCALSTATEDIR typos with
diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in
index f25789da86..378438e133 100644
--- a/src/config-files/Makefile.in
+++ b/src/config-files/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./..
myfulldir=config-files
mydir=config-files
-MY_SUBDIRS=.
BUILDTOP=$(REL)..
all::
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 20a11c3309..d93a545384 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * pre.in (SUBDIRS): Use autoconf substitution trick to make
+ SUBDIRS contain @subdirs@ only for the directory containing the
+ configure script, and only LOCAL_SUBDIRS elsewhere.
+
+ * post.in (RECURSE_TARGETS): Drop MY_SUBDIRS support.
+
2004-02-24 Ken Raeburn <raeburn@mit.edu>
* pre.in (APPUTILS_DEPLIB, APPUTILS_LIB): New vars.
diff --git a/src/config/post.in b/src/config/post.in
index 85f6bb9827..26d5aa176d 100644
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -168,11 +168,7 @@ RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \
$(RECURSE_TARGETS):
@case "`echo 'x$(MFLAGS)'|sed -e 's/^x//' -e 's/ --.*$$//'`" \
in *[ik]*) e="status=1" ;; *) e="exit 1";; esac; \
- if test -z "$(MY_SUBDIRS)" ; then \
- do_subdirs="$(SUBDIRS)" ; \
- else \
- do_subdirs="$(MY_SUBDIRS)" ; \
- fi; \
+ do_subdirs="$(SUBDIRS)" ; \
status=0; \
if test -n "$$do_subdirs" && test -z "$(NORECURSE)"; then \
for i in $$do_subdirs ; do \
diff --git a/src/config/pre.in b/src/config/pre.in
index 6b20fc7693..67930b2405 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -131,7 +131,10 @@ C=./
# "/" for UNIX, "\" for Windows; *sigh*
S=/
-SUBDIRS = @subdirs@ $(LOCAL_SUBDIRS)
+#SUBDIRS = @subdirs@ $(LOCAL_SUBDIRS)
+SUBDIRS_@top_srcdir@ = @subdirs@
+SUBDIRS = $(SUBDIRS_@srcdir@) $(LOCAL_SUBDIRS)
+#
srcdir = @srcdir@
SRCTOP = @srcdir@/$(BUILDTOP)
VPATH = @srcdir@
diff --git a/src/gen-manpages/ChangeLog b/src/gen-manpages/ChangeLog
index 48ccebcd4d..7c7cb1a1cb 100644
--- a/src/gen-manpages/ChangeLog
+++ b/src/gen-manpages/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2002-08-23 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
diff --git a/src/gen-manpages/Makefile.in b/src/gen-manpages/Makefile.in
index ab99fcdb5e..a005278b50 100644
--- a/src/gen-manpages/Makefile.in
+++ b/src/gen-manpages/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./..
myfulldir=gen-manpages
mydir=gen-manpages
-MY_SUBDIRS=.
BUILDTOP=$(REL)..
all::
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 0fd2369ab2..6b2ba91abd 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
2004-03-05 Ken Raeburn <raeburn@mit.edu>
* krb5.hin (krb5_kt_register): Ops table is now const.
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index a7fb55772a..a54505982d 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=include
mydir=.
-MY_SUBDIRS=krb5 @maybe_kerberosIV@
+LOCAL_SUBDIRS=krb5 @maybe_kerberosIV@
BUILDTOP=$(REL)..
##DOSBUILDTOP = ..
NO_OUTPRE=1
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 226443b38b..d05f70d384 100644
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2003-09-23 Jeffrey Altman <jaltman@mit.edu>
* krb.h: Modify the declaration of the CREDENTIALS structure to
diff --git a/src/include/kerberosIV/Makefile.in b/src/include/kerberosIV/Makefile.in
index 9de938f5f2..785484f918 100644
--- a/src/include/kerberosIV/Makefile.in
+++ b/src/include/kerberosIV/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./..
myfulldir=include/kerberosIV
mydir=kerberosIV
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..
KRB4_HEADERS=krb.h des.h mit-copyright.h
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 09f6dad99c..9edf7e4813 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2003-08-26 Ken Raeburn <raeburn@mit.edu>
* k5-config.h: Unused file deleted.
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 037130a905..bca7cd33fa 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./..
myfulldir=include/krb5
mydir=krb5
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..
KRB5RCTMPDIR= @KRB5_RCTMPDIR@
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 96af4b12a3..617f06c9c0 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2004-03-05 Ken Raeburn <raeburn@mit.edu>
* configure.in: Removed. Directory configured from top level
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index d288b4fae0..3a44b0fea1 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=..
myfulldir=kdc
mydir=kdc
-MY_SUBDIRS=.
BUILDTOP=$(REL)..
# -DUSE_RCACHE - enable replay cache for KDC
# -DNOCACHE - disable lookaside cache, which is used to resend previous
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 0e621f2d60..f1f2548b03 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2004-03-05 Ken Raeburn <raeburn@mit.edu>
* configure.in: Removed. Directory configured from top level
diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 3f17f89267..68e7b36137 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=..
myfulldir=krb524
mydir=krb524
-MY_SUBDIRS=.
BUILDTOP=$(REL)..
# Copyright 1994 by OpenVision Technologies, Inc.
#
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index f27894cdd0..80e49d9fc9 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
2004-02-26 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (MY_SUBDIRS): Add apputils.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 54e20c2bfc..04659d08aa 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib
mydir=lib
-MY_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5 apputils
+LOCAL_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5 apputils
BUILDTOP=$(REL)..
MAC_SUBDIRS = crypto krb5 gssapi
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index 41cae76aab..4b5678634f 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2004-03-05 Ken Raeburn <raeburn@mit.edu>
* configure.in: Removed. Directory configured from top level
diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index 1f97c8d7c0..bca4663a73 100644
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=..
myfulldir=slave
mydir=slave
-MY_SUBDIRS=.
BUILDTOP=$(REL)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 5639956fa1..d86f53b7eb 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (LOCAL_SUBDIRS): Renamed from MY_SUBDIRS.
+
2004-03-05 Ken Raeburn <raeburn@mit.edu>
* reconf: Delete autom4te.cache directories after running
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index dc5d9ddce9..f5207181c4 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -6,7 +6,7 @@ mydir=util
##WIN32### configure scripts. The set of subdirs to use is hard-coded
##WIN32### below in the 'all-windows' target anyways, so just hide this.
##WIN32##!if 0
-MY_SUBDIRS=$(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
+LOCAL_SUBDIRS=$(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
profile pty $(MAYBE_DB_@DB_VERSION@) send-pr
##WIN32##!endif
BUILDTOP=$(REL)..
diff --git a/src/util/send-pr/ChangeLog b/src/util/send-pr/ChangeLog
index 2be0b368d4..4ae543edfe 100644
--- a/src/util/send-pr/ChangeLog
+++ b/src/util/send-pr/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in
index bee786f580..5a27fcbf0b 100644
--- a/src/util/send-pr/Makefile.in
+++ b/src/util/send-pr/Makefile.in
@@ -1,7 +1,6 @@
thisconfigdir=./../..
myfulldir=util/send-pr
mydir=util/send-pr
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..
#
# Makefile for building a standalone send-pr.
diff --git a/src/windows/ms2mit/ChangeLog b/src/windows/ms2mit/ChangeLog
index d7ac6af443..992ba4f4ff 100644
--- a/src/windows/ms2mit/ChangeLog
+++ b/src/windows/ms2mit/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in (MY_SUBDIRS): Deleted.
+
2004-01-31 Jeffrey Altman <jaltman@mit.edu>
* ms2mit.c: Do not allow ticket importing of the Initial TGT cannot
diff --git a/src/windows/ms2mit/Makefile.in b/src/windows/ms2mit/Makefile.in
index 45004e14a4..7314b987b7 100644
--- a/src/windows/ms2mit/Makefile.in
+++ b/src/windows/ms2mit/Makefile.in
@@ -5,7 +5,6 @@
thisconfigdir=./..
myfulldir=windows/ms2mit
mydir=.
-MY_SUBDIRS=.
BUILDTOP=$(REL)..$(S)..
DEFINES =
PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)