From ff23b37b046be5f4a650ce6b0df4844fcbc93e05 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 7 Jul 2003 21:16:24 +0000 Subject: [PATCH] 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." --- src/afs/Makefile.in | 4 ++-- src/afsweb/Makefile.in | 2 +- src/audit/Makefile.in | 2 +- src/auth/Makefile.in | 4 ++-- src/comerr/Makefile.in | 2 +- src/des/Makefile.in | 2 +- src/dir/Makefile.in | 4 ++-- src/dir/test/Makefile.in | 2 +- src/export/Makefile.in | 4 ++-- src/fsint/Makefile.in | 4 ++-- src/kauth/Makefile.in | 2 +- src/libacl/Makefile.in | 4 ++-- src/pam/Makefile.in | 2 +- src/ptserver/Makefile.in | 2 +- src/rx/Makefile.in | 4 ++-- src/rxdebug/Makefile.in | 4 ++-- src/rxgen/Makefile.in | 2 +- src/rxkad/Makefile.in | 4 ++-- src/rxkad/test/Makefile.in | 4 ++-- src/rxstat/Makefile.in | 4 ++-- src/sys/Makefile.in | 2 +- src/ubik/Makefile.in | 2 +- src/vlserver/Makefile.in | 4 ++-- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 9724f1cc6..d29933b06 100644 --- 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 d6936dafc..5fdc240fa 100644 --- 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 aeebffc29..864a800f5 100644 --- 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 0a0985525..3a1416318 100644 --- 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 a7974b0bb..465c42227 100644 --- 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 388780150..0f6c2e8b5 100644 --- 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 cc27fee44..c59d12450 100644 --- 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 5fb3498fd..d775afc56 100644 --- 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 572d22624..b4f4412e5 100644 --- 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 2869fe181..c5cae22ce 100644 --- 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 59360c1db..efeab1199 100644 --- 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 08371f660..f4dc991ab 100644 --- 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 cc424c865..2672c6629 100644 --- 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 bf9eb2d76..4a1028d56 100644 --- 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 461196bb9..dc46df84a 100644 --- 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 ae2a8bf75..859be7371 100644 --- 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 ef122380a..58343545c 100644 --- 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 543e4adc7..0b23f9e29 100644 --- 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 f4e819f9e..a6cd51b79 100644 --- 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 872b4da7f..e2151521e 100644 --- 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 4082ae845..f144aa216 100644 --- 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 5384d1d2c..dae2baada 100644 --- 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 8b4daebf9..b04dc04c1 100644 --- 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} -- 2.39.5