From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Sat, 25 Sep 2010 19:28:37 +0000 (-0400)
Subject: tubik: minor Makefile cleanups
X-Git-Tag: openafs-devel-1_5_78~111
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=20c58aa2d0c501292415612eef725eab7e7f4b3c;p=packages%2Fo%2Fopenafs.git

tubik: minor Makefile cleanups

Rework the install targets for udebug to avoid warnings in the case
where afssrvbindir = bindir

Remove commented out compile line for udebug

Reviewed-on: http://gerrit.openafs.org/2851
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit e6c9cf2466e849753db99b48b0da26665ef0a0e3)
Change-Id: Iab023770f7d28f2e8b205ae5572d12e2c14dd742
Reviewed-on: http://gerrit.openafs.org/2927
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index 6207975e2..4e73de700 100644
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -175,8 +175,6 @@ utst_client.o: ${srcdir}/utst_client.c
 udebug.o: ${srcdir}/udebug.c
 	${CCRULE}
 
-#	${CC} ${CFLAGS} -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c ${srcdir}/udebug.c
-
 uerrors.o: uerrors.c
 	${CCRULE}
 
@@ -236,10 +234,9 @@ ubik_int.xdr.o: ubik_int.xdr.c
 #
 test: all
 
-install: \
-	${DESTDIR}${libdir}/libubik_pthread.a \
-	${DESTDIR}${bindir}/udebug \
-	${DESTDIR}${afssrvbindir}/udebug
+install: ${DESTDIR}${libdir}/libubik_pthread.a udebug
+	${INSTALL} udebug ${DESTDIR}${bindir}/udebug
+	${INSTALL} udebug ${DESTDIR}${afssrvbindir}/udebug
 
 ${DEST}/bin/udebug ${DEST}/root.server/usr/afs/bin/udebug: udebug
 	${INSTALL} $? $@
@@ -281,12 +278,6 @@ ${DESTDIR}${includedir}/ubik_int.h: ubik_int.h
 ${TOP_INCDIR}/ubik_int.h: ubik_int.h
 	${INSTALL} $? $@
 
-${DESTDIR}${bindir}/udebug: udebug
-	${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/udebug: udebug
-	${INSTALL} $? $@
-
 dest: \
 	${DEST}/lib/libubik_pthread.a \
 	${DEST}/bin/udebug \