From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 21 Jan 2008 18:40:11 +0000 (+0000)
Subject: STABLE14-make-avoid-double-slash-20080121
X-Git-Tag: openafs-stable-1_4_7pre1~66
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b3a098641f83f6f365a14115463cc452cfb5f7b6;p=packages%2Fo%2Fopenafs.git

STABLE14-make-avoid-double-slash-20080121

LICENSE IPL10

avoid having double / in make commands


(cherry picked from commit 6a7461e6f8dad79894c6d2ad11edfdba689c4c77)
---

diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in
index e163eff78..0e7389787 100644
--- a/src/libadmin/bos/Makefile.in
+++ b/src/libadmin/bos/Makefile.in
@@ -12,7 +12,7 @@ CC = ${MT_CC}
 CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
-BOZO = ../../bozo/
+BOZO = ../../bozo
 
 ADMINOBJS = afs_bosAdmin.o
 
diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in
index b83da47c1..86893bb73 100644
--- a/src/libadmin/kas/Makefile.in
+++ b/src/libadmin/kas/Makefile.in
@@ -12,7 +12,7 @@ CC = ${MT_CC}
 CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -I../../kauth -I${srcdir}/../../kauth
 CCRULE = ${CC} ${CFLAGS} -c $?
 
-KAUTH= ${srcdir}/../../kauth/
+KAUTH= ${srcdir}/../../kauth
 
 ADMINOBJS = afs_kasAdmin.o
 
diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in
index fd28e1e14..177c1cf86 100644
--- a/src/libadmin/pts/Makefile.in
+++ b/src/libadmin/pts/Makefile.in
@@ -12,7 +12,7 @@ CC = ${MT_CC}
 CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
-PTSERVER = ../../ptserver/
+PTSERVER = ../../ptserver
 
 ADMINOBJS = \
 	afs_ptsAdmin.o
diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in
index ac23bf5af..b0940c3d4 100644
--- a/src/libadmin/vos/Makefile.in
+++ b/src/libadmin/vos/Makefile.in
@@ -12,9 +12,9 @@ CC = ${MT_CC}
 CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS}
 CCRULE = ${CC} ${CFLAGS} -c $?
 
-VLSERVER = ../../vlserver/
-VOLSER = ../../volser/
-FSINT = ../../fsint/
+VLSERVER = ../../vlserver
+VOLSER = ../../volser
+FSINT = ../../fsint
 
 ADMINOBJS =\
 	afs_vosAdmin.o \
diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index cef7299c4..803361531 100644
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -815,9 +815,9 @@ $(UOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
 
 # These files are for the netscape plugin
 
-$(WEBOBJ)/afs_atomlist.o: $(TOP_SRCDIR)/util//afs_atomlist.c
+$(WEBOBJ)/afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c
 	$(CRULE2)
-$(WEBOBJ)/afs_lhash.o: $(TOP_SRCDIR)/util//afs_lhash.c
+$(WEBOBJ)/afs_lhash.o: $(TOP_SRCDIR)/util/afs_lhash.c
 	$(CRULE2)
 $(WEBOBJ)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
 	$(CRULE2)
@@ -1070,7 +1070,7 @@ $(WEBOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
 
 $(JUAFS)/afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c
 	$(CRULE1)
-$(JUAFS)/afs_lhash.o: $(TOP_SRCDIR)/util//afs_lhash.c
+$(JUAFS)/afs_lhash.o: $(TOP_SRCDIR)/util/afs_lhash.c
 	$(CRULE1)
 $(JUAFS)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
 	$(CRULE1)