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>

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index da04194f5e964c0adc3c9d8761139cd1054bdc17..7ba4611d8f7c623ec28d14d091c17ba810eb3d8f 100644 (file)
--- 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 2eda848192d8b000fb1ec0d5809cc2ce86716475..3b06b89dac0be58f48a5458941f370f4feb68003 100644 (file)
--- 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