summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2002-08-23 21:50:05 +0000
committerKen Raeburn <raeburn@mit.edu>2002-08-23 21:50:05 +0000
commitb94549fe18d0da42a2106f07d4f68ca2641099c2 (patch)
tree035b3769b992820970839492f0acc3bc988118c2
parent012e060ea8532ef5c50b9271df5a12321b747238 (diff)
downloadkrb5-b94549fe18d0da42a2106f07d4f68ca2641099c2.tar.gz
krb5-b94549fe18d0da42a2106f07d4f68ca2641099c2.tar.xz
krb5-b94549fe18d0da42a2106f07d4f68ca2641099c2.zip
Change $(S)=>/ and $(U)=>.. globally
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14761 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/appl/ChangeLog4
-rw-r--r--src/appl/Makefile.in2
-rw-r--r--src/appl/bsd/ChangeLog4
-rw-r--r--src/appl/bsd/Makefile.in2
-rw-r--r--src/appl/gss-sample/ChangeLog4
-rw-r--r--src/appl/gss-sample/Makefile.in2
-rw-r--r--src/appl/gssftp/ChangeLog4
-rw-r--r--src/appl/gssftp/Makefile.in2
-rw-r--r--src/appl/gssftp/ftp/ChangeLog4
-rw-r--r--src/appl/gssftp/ftp/Makefile.in2
-rw-r--r--src/appl/gssftp/ftpd/ChangeLog4
-rw-r--r--src/appl/gssftp/ftpd/Makefile.in2
-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.in2
-rw-r--r--src/appl/sample/sserver/ChangeLog4
-rw-r--r--src/appl/sample/sserver/Makefile.in2
-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.in2
-rw-r--r--src/appl/simple/server/ChangeLog4
-rw-r--r--src/appl/simple/server/Makefile.in2
-rw-r--r--src/appl/telnet/ChangeLog4
-rw-r--r--src/appl/telnet/Makefile.in2
-rw-r--r--src/appl/telnet/libtelnet/ChangeLog4
-rw-r--r--src/appl/telnet/libtelnet/Makefile.in2
-rw-r--r--src/appl/telnet/telnet/ChangeLog4
-rw-r--r--src/appl/telnet/telnet/Makefile.in2
-rw-r--r--src/appl/telnet/telnetd/ChangeLog4
-rw-r--r--src/appl/telnet/telnetd/Makefile.in2
-rw-r--r--src/appl/user_user/ChangeLog4
-rw-r--r--src/appl/user_user/Makefile.in2
-rw-r--r--src/clients/ChangeLog4
-rw-r--r--src/clients/Makefile.in2
-rw-r--r--src/clients/kdestroy/ChangeLog4
-rw-r--r--src/clients/kdestroy/Makefile.in2
-rw-r--r--src/clients/kinit/ChangeLog4
-rw-r--r--src/clients/kinit/Makefile.in2
-rw-r--r--src/clients/klist/ChangeLog4
-rw-r--r--src/clients/klist/Makefile.in2
-rw-r--r--src/clients/kpasswd/ChangeLog4
-rw-r--r--src/clients/kpasswd/Makefile.in2
-rw-r--r--src/clients/ksu/ChangeLog4
-rw-r--r--src/clients/ksu/Makefile.in2
-rw-r--r--src/clients/kvno/ChangeLog4
-rw-r--r--src/clients/kvno/Makefile.in2
-rw-r--r--src/config-files/ChangeLog4
-rw-r--r--src/config-files/Makefile.in2
-rw-r--r--src/config/ChangeLog4
-rw-r--r--src/config/pre.in4
-rw-r--r--src/gen-manpages/ChangeLog4
-rw-r--r--src/gen-manpages/Makefile.in2
-rw-r--r--src/include/ChangeLog4
-rw-r--r--src/include/Makefile.in6
-rw-r--r--src/include/kerberosIV/ChangeLog4
-rw-r--r--src/include/kerberosIV/Makefile.in4
-rw-r--r--src/include/krb5/ChangeLog4
-rw-r--r--src/include/krb5/Makefile.in2
-rw-r--r--src/kadmin/ChangeLog4
-rw-r--r--src/kadmin/Makefile.in2
-rw-r--r--src/kadmin/cli/ChangeLog4
-rw-r--r--src/kadmin/cli/Makefile.in2
-rw-r--r--src/kadmin/dbutil/ChangeLog4
-rw-r--r--src/kadmin/dbutil/Makefile.in2
-rw-r--r--src/kadmin/kdbkeys/ChangeLog4
-rw-r--r--src/kadmin/kdbkeys/Makefile.in2
-rw-r--r--src/kadmin/ktutil/ChangeLog4
-rw-r--r--src/kadmin/ktutil/Makefile.in2
-rw-r--r--src/kadmin/passwd/ChangeLog4
-rw-r--r--src/kadmin/passwd/Makefile.in2
-rw-r--r--src/kadmin/passwd/unit-test/ChangeLog4
-rw-r--r--src/kadmin/passwd/unit-test/Makefile.in2
-rw-r--r--src/kadmin/server/ChangeLog4
-rw-r--r--src/kadmin/server/Makefile.in2
-rw-r--r--src/kadmin/testing/ChangeLog4
-rw-r--r--src/kadmin/testing/Makefile.in2
-rw-r--r--src/kadmin/testing/scripts/ChangeLog4
-rw-r--r--src/kadmin/testing/scripts/Makefile.in2
-rw-r--r--src/kadmin/testing/util/ChangeLog4
-rw-r--r--src/kadmin/testing/util/Makefile.in2
-rw-r--r--src/kadmin/v4server/ChangeLog4
-rw-r--r--src/kadmin/v4server/Makefile.in2
-rw-r--r--src/kadmin/v4server/unit-test/ChangeLog4
-rw-r--r--src/kadmin/v4server/unit-test/Makefile.in2
-rw-r--r--src/kadmin/v5passwdd/ChangeLog4
-rw-r--r--src/kadmin/v5passwdd/Makefile.in10
-rw-r--r--src/kdc/ChangeLog4
-rw-r--r--src/kdc/Makefile.in2
-rw-r--r--src/krb524/ChangeLog4
-rw-r--r--src/krb524/Makefile.in6
-rw-r--r--src/lib/ChangeLog4
-rw-r--r--src/lib/Makefile.in2
-rw-r--r--src/lib/crypto/ChangeLog4
-rw-r--r--src/lib/crypto/Makefile.in2
-rw-r--r--src/lib/crypto/arcfour/ChangeLog4
-rw-r--r--src/lib/crypto/arcfour/Makefile.in2
-rw-r--r--src/lib/crypto/crc32/ChangeLog4
-rw-r--r--src/lib/crypto/crc32/Makefile.in2
-rw-r--r--src/lib/crypto/des/ChangeLog4
-rw-r--r--src/lib/crypto/des/Makefile.in2
-rw-r--r--src/lib/crypto/dk/ChangeLog4
-rw-r--r--src/lib/crypto/dk/Makefile.in2
-rw-r--r--src/lib/crypto/enc_provider/ChangeLog4
-rw-r--r--src/lib/crypto/enc_provider/Makefile.in2
-rw-r--r--src/lib/crypto/hash_provider/ChangeLog4
-rw-r--r--src/lib/crypto/hash_provider/Makefile.in2
-rw-r--r--src/lib/crypto/keyhash_provider/ChangeLog4
-rw-r--r--src/lib/crypto/keyhash_provider/Makefile.in2
-rw-r--r--src/lib/crypto/md4/ChangeLog4
-rw-r--r--src/lib/crypto/md4/Makefile.in2
-rw-r--r--src/lib/crypto/md5/ChangeLog4
-rw-r--r--src/lib/crypto/md5/Makefile.in2
-rw-r--r--src/lib/crypto/old/ChangeLog4
-rw-r--r--src/lib/crypto/old/Makefile.in2
-rw-r--r--src/lib/crypto/raw/ChangeLog4
-rw-r--r--src/lib/crypto/raw/Makefile.in2
-rw-r--r--src/lib/crypto/sha1/ChangeLog4
-rw-r--r--src/lib/crypto/sha1/Makefile.in2
-rw-r--r--src/lib/crypto/yarrow/ChangeLog4
-rw-r--r--src/lib/crypto/yarrow/Makefile.in2
-rw-r--r--src/lib/des425/ChangeLog4
-rw-r--r--src/lib/des425/Makefile.in2
-rw-r--r--src/lib/gssapi/ChangeLog4
-rw-r--r--src/lib/gssapi/Makefile.in2
-rw-r--r--src/lib/gssapi/generic/ChangeLog4
-rw-r--r--src/lib/gssapi/generic/Makefile.in14
-rw-r--r--src/lib/gssapi/krb5/ChangeLog4
-rw-r--r--src/lib/gssapi/krb5/Makefile.in6
-rw-r--r--src/lib/gssapi/mechglue/ChangeLog4
-rw-r--r--src/lib/gssapi/mechglue/Makefile.in8
-rw-r--r--src/lib/kadm5/ChangeLog4
-rw-r--r--src/lib/kadm5/Makefile.in2
-rw-r--r--src/lib/kadm5/clnt/ChangeLog4
-rw-r--r--src/lib/kadm5/clnt/Makefile.in2
-rw-r--r--src/lib/kadm5/srv/ChangeLog4
-rw-r--r--src/lib/kadm5/srv/Makefile.in2
-rw-r--r--src/lib/kadm5/unit-test/ChangeLog4
-rw-r--r--src/lib/kadm5/unit-test/Makefile.in2
-rw-r--r--src/lib/kdb/ChangeLog4
-rw-r--r--src/lib/kdb/Makefile.in2
-rw-r--r--src/lib/krb4/ChangeLog4
-rw-r--r--src/lib/krb4/Makefile.in4
-rw-r--r--src/lib/krb5/ChangeLog4
-rw-r--r--src/lib/krb5/Makefile.in2
-rw-r--r--src/lib/krb5/asn.1/ChangeLog4
-rw-r--r--src/lib/krb5/asn.1/Makefile.in2
-rw-r--r--src/lib/krb5/ccache/ChangeLog4
-rw-r--r--src/lib/krb5/ccache/Makefile.in4
-rw-r--r--src/lib/krb5/ccache/ccapi/ChangeLog4
-rw-r--r--src/lib/krb5/ccache/ccapi/Makefile.in2
-rw-r--r--src/lib/krb5/error_tables/ChangeLog4
-rw-r--r--src/lib/krb5/error_tables/Makefile.in6
-rw-r--r--src/lib/krb5/keytab/ChangeLog4
-rw-r--r--src/lib/krb5/keytab/Makefile.in2
-rw-r--r--src/lib/krb5/keytab/db/ChangeLog4
-rw-r--r--src/lib/krb5/keytab/db/Makefile.in2
-rw-r--r--src/lib/krb5/krb/ChangeLog4
-rw-r--r--src/lib/krb5/krb/Makefile.in2
-rw-r--r--src/lib/krb5/os/ChangeLog4
-rw-r--r--src/lib/krb5/os/Makefile.in2
-rw-r--r--src/lib/krb5/posix/ChangeLog4
-rw-r--r--src/lib/krb5/posix/Makefile.in2
-rw-r--r--src/lib/krb5/rcache/ChangeLog4
-rw-r--r--src/lib/krb5/rcache/Makefile.in2
-rw-r--r--src/lib/rpc/ChangeLog4
-rw-r--r--src/lib/rpc/Makefile.in2
-rw-r--r--src/lib/rpc/unit-test/ChangeLog4
-rw-r--r--src/lib/rpc/unit-test/Makefile.in2
-rw-r--r--src/slave/ChangeLog4
-rw-r--r--src/slave/Makefile.in2
-rw-r--r--src/tests/ChangeLog4
-rw-r--r--src/tests/Makefile.in2
-rw-r--r--src/tests/asn.1/ChangeLog4
-rw-r--r--src/tests/asn.1/Makefile.in2
-rw-r--r--src/tests/create/ChangeLog4
-rw-r--r--src/tests/create/Makefile.in2
-rw-r--r--src/tests/dejagnu/ChangeLog4
-rw-r--r--src/tests/dejagnu/Makefile.in2
-rw-r--r--src/tests/gssapi/ChangeLog4
-rw-r--r--src/tests/gssapi/Makefile.in2
-rw-r--r--src/tests/hammer/ChangeLog4
-rw-r--r--src/tests/hammer/Makefile.in2
-rw-r--r--src/tests/resolve/ChangeLog4
-rw-r--r--src/tests/resolve/Makefile.in2
-rw-r--r--src/tests/verify/ChangeLog4
-rw-r--r--src/tests/verify/Makefile.in2
-rw-r--r--src/util/ChangeLog4
-rw-r--r--src/util/Makefile.in2
-rw-r--r--src/util/db2/ChangeLog6
-rw-r--r--src/util/db2/Makefile.in2
-rw-r--r--src/util/db2/btree/Makefile.in2
-rw-r--r--src/util/db2/clib/Makefile.in2
-rw-r--r--src/util/db2/db/Makefile.in2
-rw-r--r--src/util/db2/hash/Makefile.in2
-rw-r--r--src/util/db2/mpool/Makefile.in2
-rw-r--r--src/util/db2/recno/Makefile.in2
-rw-r--r--src/util/db2/test/ChangeLog4
-rw-r--r--src/util/db2/test/Makefile.in2
-rw-r--r--src/util/et/ChangeLog4
-rw-r--r--src/util/et/Makefile.in4
-rw-r--r--src/util/profile/ChangeLog4
-rw-r--r--src/util/profile/Makefile.in4
-rw-r--r--src/util/pty/ChangeLog4
-rw-r--r--src/util/pty/Makefile.in2
-rw-r--r--src/util/send-pr/ChangeLog4
-rw-r--r--src/util/send-pr/Makefile.in2
-rw-r--r--src/util/ss/ChangeLog4
-rw-r--r--src/util/ss/Makefile.in2
-rw-r--r--src/windows/ms2mit/ChangeLog4
-rw-r--r--src/windows/ms2mit/Makefile.in2
212 files changed, 548 insertions, 138 deletions
diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog
index 5efe7930f9..6f0342b3ad 100644
--- a/src/appl/ChangeLog
+++ b/src/appl/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-11-05 Ezra Peisach <epeisach@mit.edu>
* configure.in: Add KRB5_GETPEERNAME_ARGS and
diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 217aee5b37..9c8df958bb 100644
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=appl
mydir=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
MY_SUBDIRS= sample simple user_user bsd gss-sample gssftp telnet
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index ead7e866b3..dbc1a51098 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-23 Ezra Peisach <epeisach@bu.edu>
* compat_recv.c: Include defines.h for prototypes.
diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index a8d2ea6241..c0569494c1 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=appl/bsd
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCALINCLUDES=@KRB4_INCLUDES@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index b466bae615..59f69a2408 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-13 Ken Raeburn <raeburn@mit.edu>
* Makefile.in ($(OUTPRE)gss-server.exe, $(OUTPRE)gss-server.exe):
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index 42519e9221..8a67aac964 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
myfulldir=appl/gss-sample
mydir=gss-sample
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
DEFINES = -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 b40111dae7..96fc245f47 100644
--- a/src/appl/gssftp/ChangeLog
+++ b/src/appl/gssftp/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-07-24 Tom Yu <tlyu@mit.edu>
* configure.in: Add check for getev() to avoid problems when
diff --git a/src/appl/gssftp/Makefile.in b/src/appl/gssftp/Makefile.in
index b498b13d7a..3a866a61cf 100644
--- a/src/appl/gssftp/Makefile.in
+++ b/src/appl/gssftp/Makefile.in
@@ -1,6 +1,6 @@
thisconfigdir=.
myfulldir=appl/gssftp
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCAL_SUBDIRS=ftp ftpd
LDFLAGS = -g
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 7953c77824..1e4acdce8b 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-13 Ken Raeburn <raeburn@mit.edu>
* Makefile.in ($(OUTPRE)ftp.exe): Use ws2_32.lib instead of
diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index fac256f890..5c5e0dc56c 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=appl/gssftp/ftp
mydir=ftp
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
#
# appl/gssftp/ftp/Makefile.in
#
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 08a2ceb470..1d664e645e 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-23 Ezra Peisach <epeisach@bu.edu>
* ftpd.c (auth_data, reply_gss_code): Use OM_uint32 instead of int
diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index dabfe1d300..a2b8a36f82 100644
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=appl/gssftp/ftpd
mydir=ftpd
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
#
# appl/gssftp/ftpd/Makefile.in
#
diff --git a/src/appl/sample/ChangeLog b/src/appl/sample/ChangeLog
index 890c7f34e0..5d2c078ade 100644
--- a/src/appl/sample/ChangeLog
+++ b/src/appl/sample/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
1999-10-26 Wilfredo Sanchez <tritan@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index e0c7ce53d7..1476fa1287 100644
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -2,4 +2,4 @@ thisconfigdir=./..
myfulldir=appl/sample
mydir=sample
MY_SUBDIRS = sclient sserver
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 4fdcef4ad5..d70b4b8358 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-04-05 Ken Raeburn <raeburn@mit.edu>
* sclient.c: Include fake-addrinfo.h. Include stdlib.h
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index cf286a4ae1..8240529cf6 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -3,7 +3,7 @@ myfulldir=appl/sample/sclient
mydir=sample/sclient
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index 041e776fb6..f9b7416070 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-11-05 Ezra Peisach <epeisach@mit.edu>
* sserver.c (main): Use GETPEERNAME_ARG3_TYPE instead of int.
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index cf3a1517cc..0fc1561df1 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -3,7 +3,7 @@ myfulldir=appl/sample/sserver
mydir=sample/sserver
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/simple/ChangeLog b/src/appl/simple/ChangeLog
index 88db925fd5..541fac7b14 100644
--- a/src/appl/simple/ChangeLog
+++ b/src/appl/simple/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
1999-10-26 Wilfredo Sanchez <tritan@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 1331664b9f..27638d0021 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -2,4 +2,4 @@ thisconfigdir=./..
myfulldir=appl/simple
mydir=simple
MY_SUBDIRS = client server
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 908eef056a..6ee16e9274 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-04-05 Ken Raeburn <raeburn@mit.edu>
* sim_client.c: Always include stdlib.h.
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 5ac73b9644..c9a3b65a21 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./../..
myfulldir=appl/simple/client
mydir=simple/client
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index d8204db8b0..921fda120f 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2000-10-16 Ezra Peisach <epeisach@mit.edu>
* sim_server.c: Cast to int strings width arguments in printf.
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index ade8d583b6..2bef3c9d74 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./../..
myfulldir=appl/simple/server
mydir=simple/server
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES= -I.. -I$(srcdir)/..
diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog
index 62fb2e8a0f..ae4d6b8aa4 100644
--- a/src/appl/telnet/ChangeLog
+++ b/src/appl/telnet/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
1998-11-13 Theodore Ts'o <tytso@rsts-11.mit.edu>
* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/appl/telnet/Makefile.in b/src/appl/telnet/Makefile.in
index 6d7f9632e3..004d9c1a7c 100644
--- a/src/appl/telnet/Makefile.in
+++ b/src/appl/telnet/Makefile.in
@@ -1,4 +1,4 @@
thisconfigdir=.
myfulldir=appl/telnet
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index be7e4d7a53..73a9d54079 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-04-12 Sam Hartman <hartmans@mit.edu>
* kerberos5.c forward.c: Build without k5-int.h
diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index ed380799eb..479da66095 100644
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=appl/telnet/libtelnet
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
# derived from the original Makefile.generic
#
# Copyright (c) 1991 The Regents of the University of California.
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index af380bf20e..5e642e7347 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-04-12 Tom Yu <tlyu@mit.edu>
* configure.in: Sepcial-case solaris+gcc to always find curses.h,
diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 21408b3228..962a71f3b8 100644
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=appl/telnet/telnet
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
# 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 3bdfec6e7a..2be421534d 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-08 Jen Selby <jenselby@mit.edu>
* telnetd.c: Switched the valid and user descriptions under the -a
diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index f07cbf74df..9a9b34574e 100644
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=appl/telnet/telnetd
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
# 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 0d226a1543..01a1c397fc 100644
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-03-28 Ken Raeburn <raeburn@mit.edu>
* client.c, server.c: Include errno.h.
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 5185da516e..7a71515aef 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
myfulldir=appl/user_user
mydir=user_user
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
DEFINES = -DDEBUG
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/ChangeLog b/src/clients/ChangeLog
index 845013db62..72b71c0be3 100644
--- a/src/clients/ChangeLog
+++ b/src/clients/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-04-26 Ken Raeburn <raeburn@mit.edu>
* configure.in: Don't look for getipnodebyaddr.
diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index ddc3cba0ba..ac5c56625b 100644
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=clients
mydir=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
LOCAL_SUBDIRS= klist kinit kdestroy kpasswd ksu kvno
diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 6d6cf1fb80..c957432011 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-06-08 Ezra Peisach <epeisach@mit.edu>
* kdestroy.c: Include unistd.h (if present) for getopt() prototype.
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index ea9ed611ca..a437db7c36 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=clients/kdestroy
mydir=kdestroy
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index 7399f08dcd..044d7a3766 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-30 Ezra Peisach <epeisach@bu.edu>
* kinit.c (ULINE): Invoke fprintf with correct number of arguments
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index 7d1cb5ff57..e29fc5f234 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=clients/kinit
mydir=kinit
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 947e4492e5..24994496db 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-13 Ken Raeburn <raeburn@mit.edu>
* Makefile.in ($(OUTPRE)klist.exe): Use ws2_32.lib instead of
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index dda5023605..65a48d9647 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=clients/klist
mydir=klist
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog
index 2455763f35..1a5be10944 100644
--- a/src/clients/kpasswd/ChangeLog
+++ b/src/clients/kpasswd/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-18 Jen Selby <jenselby@mit.edu>
* kpasswd.M: commented out the inclusion of man1/header.doc
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index a9fed31e2e..c7329149d0 100644
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=clients/kpasswd
mydir=kpasswd
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 5031183fe9..e8f920e614 100644
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-14 Jen Selby <jenselby@mit.edu>
* main.c: updated the usage function
diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index c7d4029716..db8a64c42c 100644
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=clients/ksu
mydir=ksu
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/clients/kvno/ChangeLog b/src/clients/kvno/ChangeLog
index 380b58231a..40b7bbf7bf 100644
--- a/src/clients/kvno/ChangeLog
+++ b/src/clients/kvno/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-15 Tom Yu <tlyu@mit.edu>
* kvno.c (do_v4_kvno): Initialize name, inst, realm to empty
diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index 25adaa0aa5..c3892beab9 100644
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=clients/kvno
mydir=kvno
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog
index 9ee2c3af7d..887e84f895 100644
--- a/src/config-files/ChangeLog
+++ b/src/config-files/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-22 Jen Selby <jenselby@mit.edu>
* kdc.conf.M: added descriptions of some tags
diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in
index 52014642f3..f25789da86 100644
--- a/src/config-files/Makefile.in
+++ b/src/config-files/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
myfulldir=config-files
mydir=config-files
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
all::
install::
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 03a4c2227b..46ffa2b811 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * pre.in (S, U): Variables deleted.
+
2002-08-14 Ken Raeburn <raeburn@mit.edu>
* lib.in ($(SUBDIROBJLISTS) and .SH/.PF variants): Depend on
diff --git a/src/config/pre.in b/src/config/pre.in
index b35f4d70c3..2500f0dd96 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -57,10 +57,6 @@ Makefiles-postrecurse::
ABS=/
# begin relative path
REL=
-# up-directory
-U=..
-# path separator
-S=/
# this is magic... should only be used for preceding a program invocation
C=./
diff --git a/src/gen-manpages/ChangeLog b/src/gen-manpages/ChangeLog
index efc71d115e..48ccebcd4d 100644
--- a/src/gen-manpages/ChangeLog
+++ b/src/gen-manpages/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-24 Jen Selby <jenselby@mit.edu>
* kerberos.M: updated the output line from kinit
diff --git a/src/gen-manpages/Makefile.in b/src/gen-manpages/Makefile.in
index 2e618ec302..ab99fcdb5e 100644
--- a/src/gen-manpages/Makefile.in
+++ b/src/gen-manpages/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
myfulldir=gen-manpages
mydir=gen-manpages
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
all::
install::
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 0174a3203f..4e478c16df 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-21 Ken Raeburn <raeburn@mit.edu>
* port-sockets.h (SG_BUF): New macro.
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index d350bf2b9c..bcb72d82f4 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=.
myfulldir=include
mydir=.
MY_SUBDIRS=krb5 kerberosIV
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
##DOSBUILDTOP = ..
NO_OUTPRE=1
@@ -64,5 +64,5 @@ clean-windows::
@echo Making clean in include
install:: krb5.h profile.h
- $(INSTALL_DATA) krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h
- $(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h
+ $(INSTALL_DATA) krb5.h $(DESTDIR)$(KRB5_INCDIR)/krb5.h
+ $(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)/profile.h
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 58736cf571..2c9513755f 100644
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-12 Ken Raeburn <raeburn@mit.edu>
* krb.h: Don't include port-sockets.h. Don't check for
diff --git a/src/include/kerberosIV/Makefile.in b/src/include/kerberosIV/Makefile.in
index 31b3c75fbe..de53f51fbf 100644
--- a/src/include/kerberosIV/Makefile.in
+++ b/src/include/kerberosIV/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
myfulldir=include/kerberosIV
mydir=kerberosIV
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
KRB4_HEADERS=krb.h des.h kadm.h mit-copyright.h
all-unix:: krb_err.h
@@ -17,4 +17,4 @@ install::
done
install:: krb_err.h
- $(INSTALL_DATA) krb_err.h $(DESTDIR)$(KRB5_INCDIR)$(S)kerberosIV$(S)krb_err.h
+ $(INSTALL_DATA) krb_err.h $(DESTDIR)$(KRB5_INCDIR)/kerberosIV/krb_err.h
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 8aab8905b7..69b748c1c7 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-12 Ken Raeburn <raeburn@mit.edu>
* kwinsock.h, macsock.h: Deleted.
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 4b5d3f3611..6f61a1eea3 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
myfulldir=include/krb5
mydir=krb5
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
KRB5RCTMPDIR= @KRB5_RCTMPDIR@
##DOSBUILDTOP = ..\..
diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index 92cd209dac..eb1b3edec3 100644
--- a/src/kadmin/ChangeLog
+++ b/src/kadmin/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-26 Ezra Peisach <epeisach@mit.edu>
* configure.in: Add KRB5_GETSOCKNAME_ARGS
diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in
index 749b6c14cf..b16a100745 100644
--- a/src/kadmin/Makefile.in
+++ b/src/kadmin/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=kadmin
mydir=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
LOCAL_SUBDIRS = cli dbutil passwd ktutil server @V4SERVER@ v5passwdd testing
all::
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 8f017f4dd9..e9a79df6ce 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-14 Ken Raeburn <raeburn@mit.edu>
* dump.c: Unused file deleted.
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index 5d8bbc5316..137f35f81e 100644
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=kadmin/cli
mydir=cli
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index e0e61cd63f..94b62a8725 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-23 Tom Yu <tlyu@mit.edu>
* dump.c (dump_db): Update usage comment. Add "-rev" and
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 8f6e20d296..bb3395d686 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=kadmin/dbutil
mydir=dbutil
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
DEFINES = -DKDB4_DISABLE
LOCALINCLUDES = -I. @KRB4_INCLUDES@
PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
diff --git a/src/kadmin/kdbkeys/ChangeLog b/src/kadmin/kdbkeys/ChangeLog
index 9799206577..7ae522db7d 100644
--- a/src/kadmin/kdbkeys/ChangeLog
+++ b/src/kadmin/kdbkeys/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
1999-10-26 Wilfredo Sanchez <tritan@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/kadmin/kdbkeys/Makefile.in b/src/kadmin/kdbkeys/Makefile.in
index 139d4d234c..cc1f8516c1 100644
--- a/src/kadmin/kdbkeys/Makefile.in
+++ b/src/kadmin/kdbkeys/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=kadmin/kdbkeys
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG = kdbkeys
OBJS = kdbkeys.o
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 06af5b6388..2ad589113a 100644
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-15 Ezra Peisach <epeisach@bu.edu>
* ktutil.c (ktutil_list): Remove variable set but not used. Also,
diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index 9eb0fc3283..d99aaf32c4 100644
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=kadmin/ktutil
mydir=ktutil
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCALINCLUDES = $(KRB4_INCLUDES)
PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index da6d425cfd..f610fccce4 100644
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
Mon Feb 26 13:13:21 2001 Ezra Peisach <epeisach@mit.edu>
* kpasswd.c, tty_kpasswd.c, xm_kpasswd.c: Compiler warning
diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index 39d0830cea..368701d073 100644
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=kadmin/passwd
mydir=passwd
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCALINCLUDES = -I.
DEFINES = -DUSE_KADM5_API_VERSION=1
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/kadmin/passwd/unit-test/ChangeLog b/src/kadmin/passwd/unit-test/ChangeLog
index fd35252c6d..d2285ef53c 100644
--- a/src/kadmin/passwd/unit-test/ChangeLog
+++ b/src/kadmin/passwd/unit-test/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2000-02-23 Tom Yu <tlyu@mit.edu>
* kpasswd.0/changing.exp: Add a sleep to avoid a race with the
diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in
index 1ec39d0bb9..5190c834ff 100644
--- a/src/kadmin/passwd/unit-test/Makefile.in
+++ b/src/kadmin/passwd/unit-test/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./../..
myfulldir=kadmin/passwd/unit-test
mydir=passwd/unit-test
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
check unit-test:: unit-test-@DO_TEST@
unit-test-:
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index a4bd5ad6ae..f837808ec6 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-01 Tom Yu <tlyu@mit.edu>
* server_stubs.c: Check return value from unparse_name() in lots
diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index 0e590facba..72cc4518ba 100644
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=kadmin/server
mydir=server
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/testing/ChangeLog b/src/kadmin/testing/ChangeLog
index 5f7fe3b6d7..febd72a0d5 100644
--- a/src/kadmin/testing/ChangeLog
+++ b/src/kadmin/testing/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
1999-10-26 Wilfredo Sanchez <tritan@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in
index be5b5a8d29..e90c39b415 100644
--- a/src/kadmin/testing/Makefile.in
+++ b/src/kadmin/testing/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=kadmin/testing
mydir=testing
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCAL_SUBDIRS = scripts util
all::
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index c7ea6114ba..6a909c7f2c 100644
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2000-06-27 Ezra Peisach <epeisach@mit.edu>
* env-setup.shin: Do not override the EXPECT environment variable
diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index b9fbed4f07..7db209a2b9 100644
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./../..
myfulldir=kadmin/testing/scripts
mydir=testing/scripts
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
PERL=@PERL@
.SUFFIXES: .plin .pl
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index 1e0d9079a4..e0d204be73 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-07 Ken Raeburn <raeburn@mit.edu>
* tcl_kadm5.c (unparse_err): Handle
diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index 7135263b64..4c57250108 100644
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./../..
myfulldir=kadmin/testing/util
mydir=testing/util
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = $(TCL_INCLUDES)
PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 8865dde4a7..ff9a6e58a4 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-13 Tom Yu <tlyu@mit.edu>
* acl_files.c (canon;): Properly handle appending of the local
diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in
index 2526fdf573..77c21879c5 100644
--- a/src/kadmin/v4server/Makefile.in
+++ b/src/kadmin/v4server/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=kadmin/v4server
mydir=v4server
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
DEFINES = -DKADM5 -DNEED_SOCKETS @HESIOD_DEFS@
PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog
index ebc0d2e42d..7e15acb03e 100644
--- a/src/kadmin/v4server/unit-test/ChangeLog
+++ b/src/kadmin/v4server/unit-test/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
1999-08-31 Ken Raeburn <raeburn@mit.edu>
* lib/helpers.exp (unexpire): Move expiration date ahead a few
diff --git a/src/kadmin/v4server/unit-test/Makefile.in b/src/kadmin/v4server/unit-test/Makefile.in
index b1f9c6346c..1e56d8d125 100644
--- a/src/kadmin/v4server/unit-test/Makefile.in
+++ b/src/kadmin/v4server/unit-test/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./../..
myfulldir=kadmin/v4server/unit-test
mydir=v4server/unit-test
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
#
# $Id$
#
diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index 36d5587866..feb0b6a195 100644
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-19 Ezra Peisach <epeisach@bu.edu>
* srv_net.c: Conditionalize debugging variables inside DEBUG
diff --git a/src/kadmin/v5passwdd/Makefile.in b/src/kadmin/v5passwdd/Makefile.in
index 19b8e3586e..24b84b7585 100644
--- a/src/kadmin/v5passwdd/Makefile.in
+++ b/src/kadmin/v5passwdd/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=kadmin/v5passwdd
mydir=v5passwdd
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
@@ -32,13 +32,13 @@ $(CLI): $(CLI_OBJS) $(COMMON_OBJS) $(KRB5_BASE_DEPLIBS)
install::
for f in v5passwd; do \
$(INSTALL_PROGRAM) $$f \
- $(DESTDIR)$(CLIENT_BINDIR)$(S)`echo $$f|sed '$(transform)'`; \
- $(INSTALL_DATA) $(srcdir)$(S)$$f.M \
- ${DESTDIR}$(CLIENT_MANDIR)$(S)`echo $$f|sed '$(transform)'`.1; \
+ $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \
+ $(INSTALL_DATA) $(srcdir)/$$f.M \
+ ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
done
for f in v5passwdd; do \
$(INSTALL_PROGRAM) $$f \
- $(DESTDIR)$(SERVER_BINDIR)$(S)`echo $$f|sed '$(transform)'`; \
+ $(DESTDIR)$(SERVER_BINDIR)/`echo $$f|sed '$(transform)'`; \
done
clean::
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index d2b3e7ab05..dfd79793f1 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-15 Tom Yu <tlyu@mit.edu>
* kerberos_v4.c: For consistency, check for both DISALLOW_ALL_TIX
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 855726e093..d78d1c9748 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=kdc
mydir=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
# -DUSE_RCACHE - enable replay cache for KDC
# -DNOCACHE - disable lookaside cache, which is used to resend previous
# response to replay (i.e., *don't* define this if you
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 0cb7947e54..b212c67c76 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-15 Tom Yu <tlyu@mit.edu>
* krb524d.c (kdc_get_server_key): Check for DISALLOW_ALL_TIX and
diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index e736156b50..514b01fccd 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=krb524
mydir=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
# Copyright 1994 by OpenVision Technologies, Inc.
#
# Permission to use, copy, modify, distribute, and sell this software
@@ -90,8 +90,8 @@ STLIBOBJS = \
GENS = krb524_err.c krb524_err.h
-KRB524_HDR=$(BUILDTOP)$(S)include$(S)krb524.h
-KRB524_ERR_HDR=$(BUILDTOP)$(S)include$(S)krb524_err.h
+KRB524_HDR=$(BUILDTOP)/include/krb524.h
+KRB524_ERR_HDR=$(BUILDTOP)/include/krb524_err.h
all-unix:: $(GENS)
all-unix:: all-libs
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index f59632b36d..9b307b5c45 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-25 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (MY_SUBDIRS): Don't list krb5util.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index c82234fd3f..01a43511db 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
myfulldir=lib
mydir=lib
MY_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
MAC_SUBDIRS = crypto krb5 gssapi
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index ef26bff4b1..f8b5b87723 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-22 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (SUBDIROBJLISTS): New variable.
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index cdac84e874..928e29584f 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/crypto
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCAL_SUBDIRS=crc32 des dk enc_provider hash_provider keyhash_provider \
md4 md5 old raw sha1 arcfour yarrow
LOCALINCLUDES = -I$(srcdir)/enc_provider \
diff --git a/src/lib/crypto/arcfour/ChangeLog b/src/lib/crypto/arcfour/ChangeLog
index 6c0e812b1e..f52992c938 100644
--- a/src/lib/crypto/arcfour/ChangeLog
+++ b/src/lib/crypto/arcfour/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-05-13 Sam Hartman <hartmans@mit.edu>
* arcfour.c: Microsoft indicates that they have changed some key
diff --git a/src/lib/crypto/arcfour/Makefile.in b/src/lib/crypto/arcfour/Makefile.in
index d313cdc664..d55489983c 100644
--- a/src/lib/crypto/arcfour/Makefile.in
+++ b/src/lib/crypto/arcfour/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/arcfour
mydir=arcfour
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../md4
##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 9a57128af0..59560814c9 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-19 Ezra Peisach <epeisach@bu.edu>
* Makefile.in (clean-unix): Remove t_crc.o and t_crc.
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index c88eb5b51a..49be101e75 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/crc32
mydir=crc32
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=crc32
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index d19cc47306..99df399976 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-16 Tom Yu <tlyu@mit.edu>
* string2key.c: Work around possible bug with AFS salts;
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index cb4c88f1e7..d1a9e7b615 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/des
mydir=des
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=des
diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index a82f001686..8cd70dbe0c 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-09 Ken Raeburn <raeburn@mit.edu>
* dk.h: Make prototypes unconditional.
diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in
index b4f2f27d78..52fd6efe5c 100644
--- a/src/lib/crypto/dk/Makefile.in
+++ b/src/lib/crypto/dk/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/dk
mydir=dk
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(srcdir)/..
##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/crypto/enc_provider/ChangeLog b/src/lib/crypto/enc_provider/ChangeLog
index bb66d7b8d9..8f064c4cf4 100644
--- a/src/lib/crypto/enc_provider/ChangeLog
+++ b/src/lib/crypto/enc_provider/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-02-22 Ken Raeburn <raeburn@mit.edu>
* arcfour.c: Use const instead of krb5_const.
diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in
index 67344fac41..b75bb5992a 100644
--- a/src/lib/crypto/enc_provider/Makefile.in
+++ b/src/lib/crypto/enc_provider/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/enc_provider
mydir=enc_provider
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../arcfour
##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/crypto/hash_provider/ChangeLog b/src/lib/crypto/hash_provider/ChangeLog
index 8775ad0a5c..c2d0544104 100644
--- a/src/lib/crypto/hash_provider/ChangeLog
+++ b/src/lib/crypto/hash_provider/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-04-10 Ken Raeburn <raeburn@mit.edu>
* hash_md4.c (k5_md4_hash): Cast argument to krb5_MD4Update.
diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in
index 29de1c2ceb..d43c53a27b 100644
--- a/src/lib/crypto/hash_provider/Makefile.in
+++ b/src/lib/crypto/hash_provider/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/hash_provider
mydir=hash_provider
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(srcdir)/../crc32 -I$(srcdir)/../md4 \
-I$(srcdir)/../md5 -I$(srcdir)/../sha1
diff --git a/src/lib/crypto/keyhash_provider/ChangeLog b/src/lib/crypto/keyhash_provider/ChangeLog
index 84bb79577a..3c6cd2ff5d 100644
--- a/src/lib/crypto/keyhash_provider/ChangeLog
+++ b/src/lib/crypto/keyhash_provider/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-12-14 Ezra Peisach <epeisach@mit.edu>
* hmac_md5.c (k5_hmac_md5_hash): Test if malloc returns NULL and
diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in
index 60d1297df3..b850bc5c9d 100644
--- a/src/lib/crypto/keyhash_provider/Makefile.in
+++ b/src/lib/crypto/keyhash_provider/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/keyhash_provider
mydir=keyhash_provider
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../md4 \
-I$(srcdir)/../md5 -I$(srcdir)/../arcfour \
-I$(srcdir)/../hash_provider
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index 2117d72e17..1489e1433d 100644
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* md4.c, rsa-md4.h: Don't explicitly declare pointers FAR any
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 90b057accc..eb2264f8a2 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/md4
mydir=md4
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(srcdir)
##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index eaa3689f52..461e598132 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-09 Ken Raeburn <raeburn@mit.edu>
* t_mddriver.c: Make prototypes unconditional.
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index ee30dfee8d..e85b8db788 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/md5
mydir=md5
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=md5
diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog
index af64760ce0..76bff3ddda 100644
--- a/src/lib/crypto/old/ChangeLog
+++ b/src/lib/crypto/old/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-09 Ken Raeburn <raeburn@mit.edu>
* des_stringtokey.c, old.h: Make prototypes unconditional.
diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in
index ea6352cbfc..9afa24a341 100644
--- a/src/lib/crypto/old/Makefile.in
+++ b/src/lib/crypto/old/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/old
mydir=old
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(srcdir)/../des
##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/crypto/raw/ChangeLog b/src/lib/crypto/raw/ChangeLog
index 6d145e341d..ddc4ffabad 100644
--- a/src/lib/crypto/raw/ChangeLog
+++ b/src/lib/crypto/raw/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-09 Ken Raeburn <raeburn@mit.edu>
* raw.h: Make prototypes unconditional.
diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in
index 84c29109c8..11c7b27b05 100644
--- a/src/lib/crypto/raw/Makefile.in
+++ b/src/lib/crypto/raw/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/raw
mydir=raw
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=raw
diff --git a/src/lib/crypto/sha1/ChangeLog b/src/lib/crypto/sha1/ChangeLog
index 4ae5588536..eeb29fc454 100644
--- a/src/lib/crypto/sha1/ChangeLog
+++ b/src/lib/crypto/sha1/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-07 Miro Jurisic <meeroh@mit.edu>
* shs.h: use "" include for k5-int.h
diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in
index fb616c4132..0172a5dbb4 100644
--- a/src/lib/crypto/sha1/Makefile.in
+++ b/src/lib/crypto/sha1/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/sha1
mydir=sha1
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=sha1
diff --git a/src/lib/crypto/yarrow/ChangeLog b/src/lib/crypto/yarrow/ChangeLog
index a39c5a4441..c31d081a4d 100644
--- a/src/lib/crypto/yarrow/ChangeLog
+++ b/src/lib/crypto/yarrow/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-04-10 Danilo Almeida <dalmeida@mit.edu>
* yarrow.c: Use the canonical _WIN32 instead of WIN32 to test for
diff --git a/src/lib/crypto/yarrow/Makefile.in b/src/lib/crypto/yarrow/Makefile.in
index 937dfd65eb..e4d3da616d 100644
--- a/src/lib/crypto/yarrow/Makefile.in
+++ b/src/lib/crypto/yarrow/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/crypto/yarrow
mydir=yarrow
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../sha1 -I$(srcdir)/../enc_provider
##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index c92f6fbdde..4116108f7f 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-05 Ken Raeburn <raeburn@mit.edu>
* read_passwd.c, unix_time.c: Drop _MSDOS support.
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 8b616b8e69..ca1f76a423 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/des425
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCALINCLUDES = -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
##DOS##BUILDTOP = ..\..
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 6dbfe10d7b..0d1bab5535 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-22 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (SUBDIROBJLISTS): New variable.
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 934652a329..5da82cc54c 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/gssapi
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCAL_SUBDIRS= generic krb5
##DOSLIBNAME=$(OUTPRE)gssapi.lib
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 3257fd23a7..025571033f 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-15 Ezra Peisach <epeisach@bu.edu>
* gssapiP_generic.h, util_token.c (g_verify_token_header): Make
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 51cfe9b680..69653364d3 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/gssapi/generic
mydir=generic
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I. -I$(srcdir)
##DOS##BUILDTOP = ..\..\..
@@ -15,15 +15,15 @@ ETSRCS= gssapi_err_generic.c
ETOBJS= $(OUTPRE)gssapi_err_generic.$(OBJEXT)
ETHDRS= gssapi_err_generic.h
-EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
+EHDRDIR= $(BUILDTOP)/include/gssapi
-HDRS= $(EHDRDIR)$(S)gssapi.h \
- $(EHDRDIR)$(S)gssapi_generic.h
+HDRS= $(EHDRDIR)/gssapi.h \
+ $(EHDRDIR)/gssapi_generic.h
-$(EHDRDIR)$(S)gssapi.h: gssapi.h
+$(EHDRDIR)/gssapi.h: gssapi.h
$(CP) gssapi.h $@
-$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h
- $(CP) $(srcdir)$(S)gssapi_generic.h $@
+$(EHDRDIR)/gssapi_generic.h: $(srcdir)/gssapi_generic.h
+ $(CP) $(srcdir)/gssapi_generic.h $@
$(OUTPRE)gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
gssapi_err_generic.h: gssapi_err_generic.et
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 9111613a03..9f873f6918 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-15 Ezra Peisach <epeisach@bu.edu>
* k5unseal.c (kg_unseal): Pass unsigned int * instead of int *
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index ad8978a4e4..bfc4e9343f 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/gssapi/krb5
mydir=krb5
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
##DOS##BUILDTOP = ..\..\..
@@ -162,12 +162,12 @@ STLIBOBJS = \
HDRS= $(ETHDRS)
-EHDRDIR=$(BUILDTOP)$(S)include$(S)gssapi
+EHDRDIR=$(BUILDTOP)/include/gssapi
EXPORTED_HEADERS= gssapi_krb5.h
##DOS##LIBOBJS = $(OBJS)
-GSSAPI_KRB5_HDR=$(EHDRDIR)$(S)gssapi_krb5.h
+GSSAPI_KRB5_HDR=$(EHDRDIR)/gssapi_krb5.h
all-windows:: $(EHDRDIR) $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS)
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 9d94d8f0c3..9fec6c325c 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-09 Ken Raeburn <raeburn@mit.edu>
* mechglue.h: Make prototypes unconditional.
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index b63c00be5e..faa516380e 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/gssapi/mechglue
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I. -I$(srcdir)
##DOSBUILDTOP = ..\..\..
@@ -82,7 +82,7 @@ OBJS = $(OUTPRE)g_acquire_cred.$(OBJEXT) \
$(OUTPRE)oid_ops.$(OBJEXT) \
$(OUTPRE)g_mechname.$(OBJEXT)
-EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
+EHDRDIR= $(BUILDTOP)/include/gssapi
EXPORTED_HEADERS = mechglue.h
@SHARED_RULE@
@@ -125,8 +125,8 @@ clean-windows::
# Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
install::
@set -x; for f in $(EXPORTED_HEADERS) ; \
- do $(INSTALL_DATA) $(srcdir)$(S)$$f \
- $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi$(S)$$f ; \
+ do $(INSTALL_DATA) $(srcdir)/$$f \
+ $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \
done
includes::
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 532df3fc33..405c1df7f0 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-22 Ken Raeburn <raeburn@mit.edu>
* Makefile.in ($(HDRS)): Depend on "includes".
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index 6d49601165..912442a96b 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/kadm5
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCAL_SUBDIRS = clnt srv unit-test
##DOSBUILDTOP = ..\..
diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index c12adebd52..4c73099a81 100644
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-31 Tom Yu <tlyu@mit.edu>
* client_init.c (_kadm5_init_any): Use
diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index dc40b7e6a4..0da84fc402 100644
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/kadm5/clnt
mydir=clnt
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
LIB=kadm5clnt
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 2e28a555ad..aa49b04935 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-17 Ken Raeburn <raeburn@mit.edu>
* svr_iters.c (struct iter_data): Replace DynObject "matches" with
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index 318fbc287f..2a5d59b355 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/kadm5/srv
mydir=srv
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
DEFINES = @HESIOD_DEFS@
diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 9f6db4ba2d..1ef3671d9c 100644
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-08 Ken Raeburn <raeburn@mit.edu>
* api.2/init-v2.exp (test100): Expect MISSING_KRB5_CONF_PARAMS
diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in
index d75ba8f980..b916996ef0 100644
--- a/src/lib/kadm5/unit-test/Makefile.in
+++ b/src/lib/kadm5/unit-test/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/kadm5/unit-test
mydir=unit-test
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
DEFINES = -DUSE_KADM5_API_VERSION=1
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 2363ce5f74..6587bdc434 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-23 Tom Yu <tlyu@mit.edu>
* kdb_db2.h: Add prototype and rename for
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 21c65ca40e..82d4f5cad5 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/kdb
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 13de98d406..9df3d84cf9 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-07 Ken Raeburn <raeburn@mit.edu>
* cr_tkt.c (krb_cr_tkt_int): Don't take key arguments any more.
diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index 015e5a2003..2012583cd5 100644
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/krb4
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCALINCLUDES = -I$(BUILDTOP)/include/kerberosIV -I$(srcdir)/../../include/kerberosIV
##DOS##BUILDTOP = ..\..
@@ -27,7 +27,7 @@ SHLIB_EXPLIBS=-lkrb5 -lcom_err -ldes425 -lk5crypto
SHLIB_DIRS=-L$(TOPLIBD)
SHLIB_RDIRS=$(KRB5_LIBDIR)
-EHDRDIR=$(BUILDTOP)$(S)include$(S)kerberosIV
+EHDRDIR=$(BUILDTOP)/include/kerberosIV
OBJS = \
$(OUTPRE)cr_auth_repl.$(OBJEXT) \
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 3b3565bcba..e22bfe8072 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-22 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (SUBDIROBJLISTS): New variable.
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index eebbcc80ad..70929e3093 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/krb5
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCAL_SUBDIRS= error_tables asn.1 ccache keytab krb os rcache posix
##DOSBUILDTOP = ..\..
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index f8968d673a..43187e2715 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-24 Tom Yu <tlyu@mit.edu>
* asn1_encode.c (asn1_encode_generaltime): Remove call to
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index 118a4b10e0..6fd3e427d1 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/krb5/asn.1
mydir=asn.1
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=asn.1
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 80424fdcc2..0b41e37d19 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-15 Ken Raeburn <raeburn@mit.edu>
* cc_file.c (ALLOC): Use calloc, not malloc.
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index e9f2e052ab..6282f89a0e 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,14 +1,14 @@
thisconfigdir=./..
myfulldir=lib/krb5/ccache
mydir=ccache
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCAL_SUBDIRS =
RUN_SETUP = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-LOCALINCLUDES = -I$(srcdir)$(S)ccapi $(WIN_INCLUDES)
+LOCALINCLUDES = -I$(srcdir)/ccapi $(WIN_INCLUDES)
##DOS##WIN_INCLUDES = -I$(SRCTOP)\windows\lib
diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index b3e010c5be..f761ee597b 100644
--- a/src/lib/krb5/ccache/ccapi/ChangeLog
+++ b/src/lib/krb5/ccache/ccapi/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-20 Danilo Almeida <dalmeida@mit.edu>
* winccld.c: Include k5-int.h to get hidden ops struct.
diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in
index 9f8d1c5f49..ca5d773c02 100644
--- a/src/lib/krb5/ccache/ccapi/Makefile.in
+++ b/src/lib/krb5/ccache/ccapi/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./../..
myfulldir=lib/krb5/ccache/ccapi
mydir=ccache/ccapi
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../../..
LOCALINCLUDES = $(WIN_INCLUDES)
##DOS##WIN_INCLUDES = -I$(SRCTOP)\windows\lib
diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index cc6420c062..6f3fb32d88 100644
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-09 Ken Raeburn <raeburn@mit.edu>
* krb5_err.et (KRB5_ERR_NUMERIC_REALM): New error code.
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 9b5172aa4a..b1b04b413e 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,15 +1,15 @@
thisconfigdir=./..
myfulldir=lib/krb5/error_tables
mydir=error_tables
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=error_tables
##DOS##OBJFILE=..\$(OUTPRE)err_tbls.lst
##WIN16##LIBNAME=..\krb5.lib
-THDRDIR=$(BUILDTOP)$(S)include
-EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5
+THDRDIR=$(BUILDTOP)/include
+EHDRDIR=$(BUILDTOP)/include/krb5
STLIBOBJS= asn1_err.o kdb5_err.o krb5_err.o \
kv5m_err.o adm_err.o init_ets.o
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 02041dbe42..2c089b6e74 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-18 Danilo Almeida <dalmeida@mit.edu>
* ktfr_entry.c: Rename krb5_kt_free_entry_contents as
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index e659695f99..5f90b5f295 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/krb5/keytab
mydir=keytab
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=keytab
diff --git a/src/lib/krb5/keytab/db/ChangeLog b/src/lib/krb5/keytab/db/ChangeLog
index 0021a099a3..9752fcff92 100644
--- a/src/lib/krb5/keytab/db/ChangeLog
+++ b/src/lib/krb5/keytab/db/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
1999-10-26 Wilfredo Sanchez <tritan@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/lib/krb5/keytab/db/Makefile.in b/src/lib/krb5/keytab/db/Makefile.in
index 9d31de16f6..cddd0f0325 100644
--- a/src/lib/krb5/keytab/db/Makefile.in
+++ b/src/lib/krb5/keytab/db/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./../..
myfulldir=lib/krb5/keytab/db
mydir=keytab/db
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../../..
##DOSBUILDTOP = ..\..\..\..
##DOSLIBNAME=..\..\krb5.lib
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index cc6cb138d3..76ab3de3ef 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-22 Ken Raeburn <raeburn@mit.edu>
* init_ctx.c (init_common): Initialize udp_pref_limit field.
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index eb26947718..e6a5c960d5 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/krb5/krb
mydir=krb
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
RUN_SETUP = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 3de2ddf776..b5bdd71ae6 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-22 Ken Raeburn <raeburn@mit.edu>
* locate_kdc.c (krb5int_grow_addrlist): Renamed from grow_list,
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index c8f394b901..92b256f454 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/krb5/os
mydir=os
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index eba1106653..c1ab2b19f0 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-12 Ken Raeburn <raeburn@mit.edu>
* syslog.c: Include syslog.h instead of sys/syslog.h.
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index 8f33a92137..6014f582e5 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/krb5/posix
mydir=posix
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=posix
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 8972479b7b..8d74de6ab8 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-14 Miro Jurisic <meeroh@mit.edu>
* rc_io.c, rc_dfl.c: use "" includes for krb5.h and k5-int.h
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index ce465c8e36..1e7724b899 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=lib/krb5/rcache
mydir=rcache
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=rcache
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index cbe3955c48..d16cbc0dca 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-12 Tom Yu <tlyu@mit.edu>
* xdr.c (xdr_string): Fix off-by-one error; we're not vulnerable,
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index d1b379b2cd..d334a0aac9 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/rpc
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0
##DOSBUILDTOP = ..\..
diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog
index f177a6eba6..d1af15a688 100644
--- a/src/lib/rpc/unit-test/ChangeLog
+++ b/src/lib/rpc/unit-test/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-06-09 Ken Raeburn <raeburn@mit.edu>
* config/unix.exp (top level): Load helpers.exp here, to make
diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
index 148c3e20ed..c781b69445 100644
--- a/src/lib/rpc/unit-test/Makefile.in
+++ b/src/lib/rpc/unit-test/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=lib/rpc/unit-test
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
LOCALINCLUDES = -I.
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index d7d7536e89..bbf890c273 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-12-06 Ezra Peisach <epeisach@mit.edu>
* configure.in: Add KRB5_GETSOCKNAME_ARGS and KRB5_GETPEERNAME_ARGS
diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index 32248da041..81dd4e1e99 100644
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=slave
mydir=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog
index 7053bad529..d5fd50c391 100644
--- a/src/tests/ChangeLog
+++ b/src/tests/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-07 Tom Yu <tlyu@mit.edu>
* configure.in: Fix sense of HAVE_RUNTEST.
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 4c7eed06a7..00d156adf2 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,5 +1,5 @@
thisconfigdir=.
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
LOCAL_SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu
RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 5c8f449f76..de70ac87b4 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-09 Ken Raeburn <raeburn@mit.edu>
* ktest.h, ktest_equal.h, utility.c, utility.h: Make prototypes
diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index a6830955b5..2b86aeeced 100644
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=tests/asn.1
mydir=asn.1
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 7c24a40db1..dcb4212b26 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-04-05 Ken Raeburn <raeburn@mit.edu>
* kdb5_mkdums.c (main): Call krb5_c_valid_enctype instead of
diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index 1984125597..b4295a01c7 100644
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=tests/create
mydir=create
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
SRCS=$(srcdir)/kdb5_mkdums.c
diff --git a/src/tests/dejagnu/ChangeLog b/src/tests/dejagnu/ChangeLog
index 3742433599..dc1987247b 100644
--- a/src/tests/dejagnu/ChangeLog
+++ b/src/tests/dejagnu/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-17 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (RUNTEST): Variable renamed from HAVE_RUNTEST.
diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index 4400c98b09..4baab01ffa 100644
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=tests/dejagnu
mydir=dejagnu
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
RUNTEST = @RUNTEST@ $(DEJAFLAGS)
RUNTESTFLAGS =
KRB5_RUN_ENV= @KRB5_RUN_ENV@
diff --git a/src/tests/gssapi/ChangeLog b/src/tests/gssapi/ChangeLog
index 84872da091..739c851c2c 100644
--- a/src/tests/gssapi/ChangeLog
+++ b/src/tests/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-10-09 Ken Raeburn <raeburn@mit.edu>
* t_imp_name.c: Make prototypes unconditional.
diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
index 71708e0930..9140285d00 100644
--- a/src/tests/gssapi/Makefile.in
+++ b/src/tests/gssapi/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=tests/gssapi
mydir=gssapi
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
DEFINES = -DUSE_AUTOCONF_H
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index 59c97f97e3..fe3caa94c9 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-04-05 Ken Raeburn <raeburn@mit.edu>
* kdc5_hammer.c (main): Delete '-k' option which didn't do
diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in
index 88ec54ca65..d0484d12e1 100644
--- a/src/tests/hammer/Makefile.in
+++ b/src/tests/hammer/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=tests/hammer
mydir=hammer
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/resolve/ChangeLog b/src/tests/resolve/ChangeLog
index 536863cce7..cee49e3b7f 100644
--- a/src/tests/resolve/ChangeLog
+++ b/src/tests/resolve/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-07-06 Ezra Peisach <epeisach@mit.edu>
* resolve.c: Include stdlib.h (if present) for exit() prototype.
diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index d7645f7d85..8d154f75dd 100644
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=tests/resolve
mydir=resolve
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
RUN_SETUP = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 6ce4abd064..bf33bc778d 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-04-05 Ken Raeburn <raeburn@mit.edu>
* kdb5_verify.c (main): Call krb5_c_valid_enctype instead of
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index d4e1d615b7..5e9d07f6d7 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=tests/verify
mydir=verify
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index db8aa4f6b1..e66aeaf97f 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-17 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (MY_SUBDIRS): Delete dyn.
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index b9d680fb9a..df631184e5 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
myfulldir=util
mydir=util
MY_SUBDIRS=et ss profile pty db2 send-pr
-BUILDTOP=$(REL)$(U)
+BUILDTOP=$(REL)..
MAC_SUBDIRS = profile et
diff --git a/src/util/db2/ChangeLog b/src/util/db2/ChangeLog
index 520b270c12..dc6eff0a59 100644
--- a/src/util/db2/ChangeLog
+++ b/src/util/db2/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in, btree/Makefile.in, clib/Makefile.in,
+ db/Makefile.in, hash/Makefile.in, mpool/Makefile.in,
+ recno/Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-23 Tom Yu <tlyu@mit.edu>
* Makefile.in (LIBMINOR): Bump due to addition of bt_rseq().
diff --git a/src/util/db2/Makefile.in b/src/util/db2/Makefile.in
index a1e2975ce3..5ac55d08e7 100644
--- a/src/util/db2/Makefile.in
+++ b/src/util/db2/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=util/db2
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
LOCAL_SUBDIRS=hash btree db mpool recno clib test
LIB=db
diff --git a/src/util/db2/btree/Makefile.in b/src/util/db2/btree/Makefile.in
index f61521c5f7..853c4f1b10 100644
--- a/src/util/db2/btree/Makefile.in
+++ b/src/util/db2/btree/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=util/db2/btree
mydir=btree
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
STLIBOBJS= bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o \
bt_open.o bt_overflow.o bt_page.o bt_put.o bt_search.o \
bt_seq.o bt_split.o bt_utils.o
diff --git a/src/util/db2/clib/Makefile.in b/src/util/db2/clib/Makefile.in
index 37768aa67e..7cdd8a8b8e 100644
--- a/src/util/db2/clib/Makefile.in
+++ b/src/util/db2/clib/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=util/db2/clib
mydir=clib
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
STLIBOBJS=@MEMMOVE_OBJ@ @MKSTEMP_OBJ@ @STRERROR_OBJ@
LOCALINCLUDES=-I../include
diff --git a/src/util/db2/db/Makefile.in b/src/util/db2/db/Makefile.in
index 89e2689419..edfa512c64 100644
--- a/src/util/db2/db/Makefile.in
+++ b/src/util/db2/db/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=util/db2/db
mydir=db
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
STLIBOBJS=db.o
LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool
diff --git a/src/util/db2/hash/Makefile.in b/src/util/db2/hash/Makefile.in
index 24af09ab31..0d656ddb50 100644
--- a/src/util/db2/hash/Makefile.in
+++ b/src/util/db2/hash/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=util/db2/hash
mydir=hash
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
STLIBOBJS= hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \
hash_page.o hsearch.o dbm.o
diff --git a/src/util/db2/mpool/Makefile.in b/src/util/db2/mpool/Makefile.in
index 9e18d623ae..c7bef8844b 100644
--- a/src/util/db2/mpool/Makefile.in
+++ b/src/util/db2/mpool/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=util/db2/mpool
mydir=mpool
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
STLIBOBJS=mpool.o
LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../db
diff --git a/src/util/db2/recno/Makefile.in b/src/util/db2/recno/Makefile.in
index 23868ce6e6..8b1bce948b 100644
--- a/src/util/db2/recno/Makefile.in
+++ b/src/util/db2/recno/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=util/db2/recno
mydir=recno
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
STLIBOBJS= rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
rec_search.o rec_seq.o rec_utils.o
diff --git a/src/util/db2/test/ChangeLog b/src/util/db2/test/ChangeLog
index c0caa5374b..aa6653379a 100644
--- a/src/util/db2/test/ChangeLog
+++ b/src/util/db2/test/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-23 Tom Yu <tlyu@mit.edu>
* dbtest.c: Include btree.h if we're compiled with -DSTATISTICS.
diff --git a/src/util/db2/test/Makefile.in b/src/util/db2/test/Makefile.in
index 443097f1c6..7b90f6ab49 100644
--- a/src/util/db2/test/Makefile.in
+++ b/src/util/db2/test/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=./..
myfulldir=util/db2/test
mydir=test
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
+BUILDTOP=$(REL)../../..
FCTSH = @FCTSH@
TMPDIR=.
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index edbeaf748b..6233e52831 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-12 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (install): Don't install mit-sipb-copyright.h, it's
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index cc433a0982..cccad70df0 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -5,7 +5,7 @@ mydatadir=$(datadir)/et
thisconfigdir=.
myfulldir=util/et
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
RELDIR=../util/et
SED = sed
@@ -65,7 +65,7 @@ SHLIB_LIBS=
SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-COM_ERR_HDR=$(BUILDTOP)$(S)include$(S)com_err.h
+COM_ERR_HDR=$(BUILDTOP)/include/com_err.h
all-windows:: $(COM_ERR_HDR)
diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index c0913806cb..28ef0ea66a 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-14 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (EXTRADEPSRCS): New variable.
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 059a08c929..e9ec3b29d5 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=util/profile
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
##DOS##BUILDTOP = ..\..
@@ -50,7 +50,7 @@ SHLIB_RDIRS=$(KRB5_LIBDIR)
STOBJLISTS=OBJS.ST
-PROFILE_HDR=$(BUILDTOP)$(S)include$(S)profile.h
+PROFILE_HDR=$(BUILDTOP)/include/profile.h
all-unix:: includes test_parse test_profile
all-unix:: all-libs
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 798c77f4f4..93122f0193 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-07-12 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (install): Don't install libpty.h.
diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 8ad9939b7c..ed350d88c2 100644
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=util/pty
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
RELDIR=../util/pty
SED = sed
diff --git a/src/util/send-pr/ChangeLog b/src/util/send-pr/ChangeLog
index 8ecbe455d2..4c7e1098c2 100644
--- a/src/util/send-pr/ChangeLog
+++ b/src/util/send-pr/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
1999-10-26 Wilfredo Sanchez <tritan@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in
index 4168db767f..573a2e7fb6 100644
--- a/src/util/send-pr/Makefile.in
+++ b/src/util/send-pr/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./../..
myfulldir=util/send-pr
mydir=util/send-pr
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
#
# Makefile for building a standalone send-pr.
#
diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 1366ecad79..b73bc17570 100644
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2002-08-14 Ken Raeburn <raeburn@mit.edu>
* Makefile.in ($(HDRS)): Depend on 'includes'.
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index f453960dc1..f6aabb1f46 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -1,7 +1,7 @@
thisconfigdir=.
myfulldir=util/ss
mydir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
SED = sed
INSTALLLIB=cp
diff --git a/src/windows/ms2mit/ChangeLog b/src/windows/ms2mit/ChangeLog
index f2731ff4bf..ac09b8f447 100644
--- a/src/windows/ms2mit/ChangeLog
+++ b/src/windows/ms2mit/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-23 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
+
2001-11-28 Danilo Almeida <dalmeida@mit.edu>
* ms2mit.c: Make sure we get a des-cbc-crc session key instead of
diff --git a/src/windows/ms2mit/Makefile.in b/src/windows/ms2mit/Makefile.in
index 7a73d6ccab..8e7f2516f9 100644
--- a/src/windows/ms2mit/Makefile.in
+++ b/src/windows/ms2mit/Makefile.in
@@ -6,7 +6,7 @@ thisconfigdir=./..
myfulldir=windows/ms2mit
mydir=.
MY_SUBDIRS=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
+BUILDTOP=$(REL)../..
DEFINES =
PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)