Fix tptserver and tvlserver install rules

[openafs.git] / src / tvlserver / Makefile.in

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 573708b..cbae712 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -7,6 +7,12 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+HELPER_SPLINT=@HELPER_SPLINT@
+ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
 CC=${MT_CC}
 CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} 
@@ -143,26 +149,26 @@ vldbint.xdr.o: vldbint.xdr.c
        ${CCRULE}
 
 vldbint.cs.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -u -x -C -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -u -x -C -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.ss.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -x -S -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -S -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.xdr.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -x -c -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -c -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.h: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -u -x -h -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -u -x -h -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.cs.c: vldbint.h
 vldbint.ss.c: vldbint.h
 vldbint.xdr.c: vldbint.h
 
 Kvldbint.cs.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -x -k -C -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -k -C -o $@ ${VLSERVER}/vldbint.xg
 
 Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -x -k -c -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -k -c -o $@ ${VLSERVER}/vldbint.xg
 
 vlclient: vlclient.o $(OBJS) $(LIBS) 
        $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a
@@ -178,33 +184,19 @@ vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
 
 system: install
 
-${DEST}/root.server/usr/afs/bin/vlserver: vlserver
-       ${INSTALL} $? $@
-
-${DEST}/etc/vldb_convert: cnvldb
-       ${INSTALL} -f $? $@
-
-install: \
-       ${DESTDIR}${afssrvlibexecdir}/vlserver \
-       ${DESTDIR}${afssrvsbindir}/vldb_convert \
-       ${DESTDIR}${afssrvsbindir}/vldb_check
-
-${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver
-       ${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb
-       ${INSTALL} -f $? $@
-
-${DESTDIR}${afssrvsbindir}/vldb_check: vldb_check
-       ${INSTALL} $? $@
-
-dest: \
-       ${DEST}/root.server/usr/afs/bin/vlserver \
-       ${DEST}/etc/vldb_convert \
-       ${DEST}/etc/vldb_check
-
-${DEST}/etc/vldb_check: vldb_check
-       ${INSTALL} $? $@
+install: vlserver cnvldb vldb_check
+       if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
+               ${INSTALL_PROGRAM} vlserver ${DESTDIR}${afssrvlibexecdir}/vlserver; \
+               ${INSTALL_PROGRAM} cnvldb ${DESTDIR}${afssrvsbindir}/vldb_convert; \
+               ${INSTALL_PROGRAM} vldb_check ${DESTDIR}${afssrvsbindir}/vldb_check; \
+       fi
+
+dest: vlserver cnvldb vldb_check
+       if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
+               ${INSTALL_PROGRAM} vlserver ${DEST}/root.server/usr/afs/bin/vlserver; \
+               ${INSTALL_PROGRAM} cnvldb ${DEST}/etc/vldb_convert; \
+               ${INSTALL_PROGRAM} vldb_check ${DEST}/etc/vldb_check; \
+       fi
 
 #
 # Misc targets