From f56f2731552ca4dc5f5e476c1e8db14f035ec060 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 15 Jul 2011 14:06:14 +0100
Subject: [PATCH] Fix pthreaded ubik dest and install rules

Fix the dest and install rules for pthreaded ubik, and its servers, so
that they match the current Makefile style.

Change-Id: Ifd3bd181772e278518f2a90167b6524d6045645c
Reviewed-on: http://gerrit.openafs.org/5027
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/tbudb/Makefile.in | 13 ++++---------
 src/tubik/Makefile.in | 49 ++++++++++++++++++++-----------------------------
 2 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index da04194..7ba4611 100644
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -168,11 +168,11 @@ libbudb.a: budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_n
 #
 # Install targets
 #
-install: \
-	${DESTDIR}${afssrvlibexecdir}/buserver
+install: budb_server
+	${INSTALl_PROGRAM} budb_server ${DESTDIR}${afssrvlibexecdir}/buserver
 
-${DEST}/root.server/usr/afs/bin/buserver: budb_server
-	${INSTALL_PROGRAM} $? $@
+dest: budb_server
+	${INSTALL_PROGRAM} budb_server ${DEST}/root.server/usr/afs/bin/buserver
 
 #
 # Misc targets
@@ -182,9 +182,4 @@ clean:
 		*.ss.c *.cs.c core budb_server AFS_component_version_number.c
 
 include ../config/Makefile.version
-${DESTDIR}${afssrvlibexecdir}/buserver: budb_server
-	${INSTALL_PROGRAM} $? $@
-
-dest: \
-	${DEST}/root.server/usr/afs/bin/buserver
 
diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index 2eda848..3b06b89 100644
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -204,21 +204,26 @@ ubik_int.xdr.o: ubik_int.xdr.c
 #
 test: all
 
-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} $? $@
-
-${DEST}/lib/libubik_pthread.a: libubik_pthread.a
-	${INSTALL} $? $@
-
-${DEST}/include/ubik.h: ubik.h
-	${INSTALL} $? $@
-
-${DEST}/include/ubik_int.h: ubik_int.h
-	${INSTALL} $? $@
+install: libubik_pthread.a ubik.h ubik_int.h udebug
+	${INSTALL} -d ${DESTDIR}${libdir}
+	${INSTALL} -d ${DESTDIR}${includedir}
+	${INSTALL} -d ${DESTDIR}${bindir}
+	${INSTALL} -d ${DESTDIR}${afssrvbindir}
+	${INSTALL_PROGRAM} udebug ${DESTDIR}${bindir}/udebug
+	${INSTALL_PROGRAM} udebug ${DESTDIR}${afssrvbindir}/udebug
+	${INSTALL_DATA} libubik_pthread.a ${DESTDIR}${libdir}/libubik_pthread.a
+	${INSTALL_DATA} ubik.h ${DESTDIR}${includedir}/ubik.h
+	${INSTALL_DATA} ubik_int.h ${DESTDIR}${includedir}/ubik_int.h
+
+dest: libubik_pthread.a ubik.h ubik_int.h udebug
+	${INSTALL} -d ${DEST}/lib
+	${INSTALL} -d ${DEST}/include
+	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+	${INSTALL_PROGRAM} udebug ${DEST}/bin/udebug
+	${INSTALL_PROGRAM} udebug ${DEST}/root.server/usr/afs/bin/udebug
+	${INSTALL_DATA} libubik_pthread.a ${DEST}/lib/libubik_pthread.a
+	${INSTALL_DATA} ubik.h ${DEST}/include/ubik.h
+	${INSTALL_DATA} ubik_int.h ${DEST}/include/ubik_int.h
 
 #
 # Misc. targets
@@ -229,27 +234,13 @@ clean:
 
 include ../config/Makefile.version
 
-
-${DESTDIR}${libdir}/libubik_pthread.a: libubik_pthread.a
-	${INSTALL} $? $@
-
 ${TOP_LIBDIR}/libubik_pthread.a: libubik_pthread.a
 	${INSTALL} $? $@
 
-${DESTDIR}${includedir}/ubik.h: ubik.h
-	${INSTALL} $? $@
-
 ${TOP_INCDIR}/ubik.h: ubik.h
 	${INSTALL} $? $@
 
-${DESTDIR}${includedir}/ubik_int.h: ubik_int.h
-	${INSTALL} $? $@
-
 ${TOP_INCDIR}/ubik_int.h: ubik_int.h
 	${INSTALL} $? $@
 
-dest: \
-	${DEST}/lib/libubik_pthread.a \
-	${DEST}/bin/udebug \
-	${DEST}/root.server/usr/afs/bin/udebug
 
-- 
1.9.4