Install DAFS and non-DAFS fssync-debug

Install the non-DAFS fssync-debug along with the DAFS dafssync-debug,
since fssync-debug uses some structures that are specific to DAFS or
non-DAFS.

Change-Id: Ib7420857cd32f33fc3cc04f67baa1fcc90abc936
Reviewed-on: http://gerrit.openafs.org/2479
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 61bd20e..f0f57cf 100644 (file)
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -58,7 +58,7 @@ SLIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \
        ${TOP_LIBDIR}/libvlib.a ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libacl.a  ${TOP_LIBDIR}/util.a
 
-all: salvageserver fssync-debug salvsync-debug dasalvager
+all: salvageserver dafssync-debug salvsync-debug dasalvager
 
 salvaged.o: ${VOL}/salvaged.c
        ${CCRULE}
@@ -181,36 +181,36 @@ salvageserver: ${OBJECTS} ${LIBS}
 dasalvager: ${SOBJECTS} ${SLIBS}
        ${CC} ${LDFLAGS} -o dasalvager ${SOBJECTS} ${SLIBS} ${XLIBS}
 
-fssync-debug: ${FSSDEBUG_OBJS} ${LIBS}
-       ${CC} ${LDFLAGS} -o fssync-debug ${FSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
+dafssync-debug: ${FSSDEBUG_OBJS} ${LIBS}
+       ${CC} ${LDFLAGS} -o dafssync-debug ${FSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
 
 salvsync-debug: ${SSSDEBUG_OBJS} ${LIBS}
        ${CC} ${LDFLAGS} -o salvsync-debug ${SSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
 
-install: salvageserver fssync-debug salvsync-debug dasalvager
+install: salvageserver dafssync-debug salvsync-debug dasalvager
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} -d ${DESTDIR}${afssrvsbindir}
        ${INSTALL_PROGRAM} dasalvager \
                ${DESTDIR}${afssrvlibexecdir}/dasalvager
        ${INSTALL_PROGRAM} salvageserver \
                ${DESTDIR}${afssrvlibexecdir}/salvageserver
-       ${INSTALL_PROGRAM} fssync-debug \
-               ${DESTDIR}${afssrvsbindir}/fssync-debug
+       ${INSTALL_PROGRAM} dafssync-debug \
+               ${DESTDIR}${afssrvsbindir}/dafssync-debug
        ${INSTALL_PROGRAM} salvsync-debug \
                ${DESTDIR}${afssrvsbindir}/salvsync-debug
 
-dest: salvageserver fssync-debug salvsync-debug dasalvager
+dest: salvageserver dafssync-debug salvsync-debug dasalvager
        ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
        ${INSTALL_PROGRAM} dasalvager \
                ${DEST}/root.server/usr/afs/bin/dasalvager
        ${INSTALL_PROGRAM} salvageserver \
                ${DEST}/root.server/usr/afs/bin/salvageserver
-       ${INSTALL_PROGRAM} fssync-debug \
-               ${DEST}/root.server/usr/afs/bin/fssync-debug
+       ${INSTALL_PROGRAM} dafssync-debug \
+               ${DEST}/root.server/usr/afs/bin/dafssync-debug
        ${INSTALL_PROGRAM} salvsync-debug \
                ${DEST}/root.server/usr/afs/bin/salvsync-debug
 
 clean:
-       $(RM) -f *.o salvageserver core AFS_component_version_number.c fssync-debug salvsync-debug dasalvager
+       $(RM) -f *.o salvageserver core AFS_component_version_number.c dafssync-debug salvsync-debug dasalvager
 
 include ../config/Makefile.version

diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index 92ad275..10e7d88 100644 (file)
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -119,6 +119,7 @@ install: vlib.a salvager volinfo fssync-debug
        ${INSTALL_DATA} vlib.a ${DESTDIR}${libdir}/afs/libvlib.a
        ${INSTALL_PROGRAM} salvager ${DESTDIR}${afssrvlibexecdir}/salvager
        ${INSTALL_PROGRAM} volinfo ${DESTDIR}${afssrvsbindir}/volinfo
+       ${INSTALL_PROGRAM} fssync-debug ${DESTDIR}${afssrvsbindir}/fssync-debug
        ${INSTALL_DATA} nfs.h ${DESTDIR}${includedir}/afs/nfs.h
        ${INSTALL_DATA} vnode.h ${DESTDIR}${includedir}/afs/vnode.h
        ${INSTALL_DATA} vnode_inline.h ${DESTDIR}${includedir}/afs/vnode_inline.h
@@ -145,6 +146,7 @@ dest: vlib.a salvager volinfo fssync-debug
        ${INSTALL_DATA} vlib.a ${DEST}/lib/afs/libvlib.a
        ${INSTALL_PROGRAM} salvager ${DEST}/root.server/usr/afs/bin/salvager
        ${INSTALL_PROGRAM} volinfo ${DEST}/root.server/usr/afs/bin/volinfo
+       ${INSTALL_PROGRAM} fssync-debug ${DEST}/root.server/usr/afs/bin/fssync-debug
        ${INSTALL_DATA} nfs.h ${DEST}/include/afs/nfs.h
        ${INSTALL_DATA} vnode.h ${DEST}/include/afs/vnode.h
        ${INSTALL_DATA} vnode_inline.h ${DEST}/include/afs/vnode_inline.h