STABLE12-kerneldir-cleanup-20030707

FIXES 1706

"Now that the make variables KERNELDIR and UKERNELDIR are
consistently used with a trailing slash
([grand.central.org #1655] resp. STABLE12-makefile-consistency-20030701)
they should be defined without trailing slash.

This certainly doesn't change any functionality but avoids
funny looking doble slashes in the expanded make rules."

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index 9724f1cc69c5d9e35bfeb690a8490a196f12b16a..d29933b062cbbe421ca965dc3ba89d08e293b6e6 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -25,8 +25,8 @@ TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
 SHELL=/bin/sh
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
 include ../config/Makefile.${SYS_NAME}
 

diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in
index d6936dafc41ace1bafba124b5d81bbd50f367dd7..5fdc240facc54b9ba2ae89661c535e9bcb99ab90 100644 (file)
--- a/src/afsweb/Makefile.in
+++ b/src/afsweb/Makefile.in
@@ -28,7 +28,7 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR=../libuafs/
+UKERNELDIR=../libuafs
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 
 UKSRCS=nsafs.h nsafs.c securehash.c

diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in
index aeebffc29b94a8aa5d25872541075899141b5d47..864a800f57789fd45dae5d20d313be85b5a15210 100644 (file)
--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@@ -35,7 +35,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR = ../libuafs/
+UKERNELDIR = ../libuafs
 
 CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index 0a098552567d31ae9d37a7be5b5b9ff7e9dadb34..3a141631848237bce6dc3120cda4428413f11fb9 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -27,8 +27,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \
     acfg_errors.o ktc_errors.o

diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index a7974b0bb3377dfe6c9350f8c802372bd86c4982..465c42227f44aff7a88042f5f72e864d70f6c108 100644 (file)
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -27,7 +27,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR=../libuafs/
+UKERNELDIR=../libuafs
 
 CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}
 

diff --git a/src/des/Makefile.in b/src/des/Makefile.in
index 3887801501e5e56732edbc962835114ceaba32ed..0f6c2e8b579a90535b8e8cd829cf4a904885280b 100644 (file)
--- a/src/des/Makefile.in
+++ b/src/des/Makefile.in
@@ -44,7 +44,7 @@ SYS_NAME=@AFS_SYSNAME@
 SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR=../libuafs/
+UKERNELDIR=../libuafs
 
 LDFLAGS = ${XLDFLAGS}
 

diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in
index cc27fee44944502ddb71a0ace0993c01270fc36e..c59d124508e024f8431b470fd888db6e4c52450b 100644 (file)
--- a/src/dir/Makefile.in
+++ b/src/dir/Makefile.in
@@ -28,8 +28,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
 INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XINCLS}
 CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}

diff --git a/src/dir/test/Makefile.in b/src/dir/test/Makefile.in
index 5fb3498fd39f1aa776b7e7c244b4f7106d9c3817..d775afc56b8c911acf6bbd9aa051bca10a3e3e83 100644 (file)
--- a/src/dir/test/Makefile.in
+++ b/src/dir/test/Makefile.in
@@ -14,7 +14,7 @@ SHELL = /bin/sh
 
 include ../../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
+KERNELDIR = ../libafs
 INSTALL = ${SRCDIR}/bin/install
 
 INCDIRS= -I${DESTDIR}/include ${XINCLS}

diff --git a/src/export/Makefile.in b/src/export/Makefile.in
index 572d22624f781020153eef799da5cdc4b80ba177..b4f4412e5788cb9bfd0739b968cf5bad91527570 100644 (file)
--- a/src/export/Makefile.in
+++ b/src/export/Makefile.in
@@ -31,8 +31,8 @@ SYS_NAME=@AFS_SYSNAME@
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
      DEFS =
      INCS = -I${TOP_SRCDIR}/config -I${TOP_INCDIR}
    CFLAGS = ${OPTMZ} ${DEFS} ${INCS}

diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in
index 2869fe181c8114e843705c275f3cbe3d39a3f959..c5cae22cec714b9020fe9c92ba91d5421efeafe2 100644 (file)
--- a/src/fsint/Makefile.in
+++ b/src/fsint/Makefile.in
@@ -27,8 +27,8 @@ SYS_NAME=@AFS_SYSNAME@
 
 include ../config/Makefile.${SYS_NAME}
 SHELL = /bin/sh
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
 OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o
 CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index 59360c1dbc04ca548f5ac111aa6142d27c649738..efeab11992bbede554f4dd326cef19268f5031b6 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -27,7 +27,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR = ../libuafs/
+UKERNELDIR = ../libuafs
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 
 CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}

diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in
index 08371f660ab503cb8601688835ae5b0e10b05cf5..f4dc991abad8403aca33c8cc77ece40fd68aaa31 100644 (file)
--- a/src/libacl/Makefile.in
+++ b/src/libacl/Makefile.in
@@ -30,8 +30,8 @@ include ../config/Makefile.${SYS_NAME}
 
 INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I.. \
        -I${BACKDIR}/include -I${TOP_INCDIR}/afs
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
 CFLAGS = ${OPTMZ} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
 

diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index cc424c865c628eb46bea3c145492535e8af3310c..2672c6629f672f18bfaec3cb65300ebfc8caba85 100644 (file)
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -24,7 +24,7 @@ RXGEN=${TOP_SRCDIR}/rxgen/rxgen
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 SHELL=/bin/sh
-KERNELDIR = ../libafs/
+KERNELDIR = ../libafs
 
 include ../config/Makefile.${SYS_NAME}
 

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index bf9eb2d7679aa569951d20cb8162f169414b59af..4a1028d56da1ca6edc793481e284a4543f2810bb 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -25,7 +25,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR=../libuafs/
+UKERNELDIR=../libuafs
 RXGEN=${TOP_SRCDIR}/rxgen/rxgen
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 

diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
index 461196bb9b80cc24be9812d667c1af56e14b9808..dc46df84a120071674bb558bc56202aad295787f 100644 (file)
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@@ -29,8 +29,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
 CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -DRXDEBUG ${XCFLAGS}
 

diff --git a/src/rxdebug/Makefile.in b/src/rxdebug/Makefile.in
index ae2a8bf75bcb37eb148bbcb9ffffdb398c8110f9..859be7371a4eab10142fdc156d11248db1e99bb8 100644 (file)
--- a/src/rxdebug/Makefile.in
+++ b/src/rxdebug/Makefile.in
@@ -29,8 +29,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 
 CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -DRXDEBUG ${XCFLAGS}
 

diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in
index ef122380a2dff8575c8c9f5bb609ee5dd0f2d357..58343545cfabb41e67c6361c1bf9cf9e1730fbed 100644 (file)
--- a/src/rxgen/Makefile.in
+++ b/src/rxgen/Makefile.in
@@ -27,7 +27,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR=../libuafs/
+UKERNELDIR=../libuafs
 
 SRCS= rpc_main.c rpc_hout.c rpc_cout.c rpc_parse.c rpc_scan.c rpc_util.c \
        rpc_svcout.c rpc_clntout.c

diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index 543e4adc7700d699892d72ced5f53a849effcfa6..0b23f9e298409832063ce5452d0e67ae59162fe7 100644 (file)
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -29,8 +29,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 
 CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I. ${XCFLAGS}

diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in
index f4e819f9e706aa56a7cb1e2cfc6a41c2027cfb12..a6cd51b79c6c4f576af13c4f30578a10157ac259 100644 (file)
--- a/src/rxkad/test/Makefile.in
+++ b/src/rxkad/test/Makefile.in
@@ -27,8 +27,8 @@ SHELL = /bin/sh
 
 include ../../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 
 CFLAGS=${DBG} -I. -I${TOP_SRCDIR} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}

diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in
index 872b4da7fa990d57facaa0560712909439ede5f3..e2151521e70c7f1f2b6a985e656be5225310c40c 100644 (file)
--- a/src/rxstat/Makefile.in
+++ b/src/rxstat/Makefile.in
@@ -26,8 +26,8 @@ SYS_NAME=@AFS_SYSNAME@
 SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR = ../libafs/
-UKERNELDIR = ../libuafs/
+KERNELDIR = ../libafs
+UKERNELDIR = ../libuafs
 RXGEN=${TOP_SRCDIR}/rxgen/rxgen
 
 KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 4082ae84585e7f7398185c9432c32421c46bd114..f144aa216a3a218ec20f2c74056bf6e47e26a47c 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -30,7 +30,7 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-UKERNELDIR=../libuafs/
+UKERNELDIR=../libuafs
 CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR}  ${XCFLAGS}
 SFLAGS=-P -I${TOP_INCDIR}
 LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index 5384d1d2c233ddeeca660ee8a495ee28d586445d..dae2baadaf54867b929b8f0c23dfd166443d7636 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -27,7 +27,7 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS}
-UKERNELDIR=../libuafs/
+UKERNELDIR=../libuafs
 
 LIBOBJS=disk.o  remote.o beacon.o recovery.o ubik.o  vote.o lock.o phys.o \
        ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index 8b4daebf91c9faefc203097aea92aed9ba08ad89..b04dc04c1a74353a8140936809d6950873ac793d 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -26,8 +26,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-KERNELDIR=../libafs/
-UKERNELDIR=../libuafs/
+KERNELDIR=../libafs
+UKERNELDIR=../libuafs
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 
 CFLAGS=${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}