From 3f11790f6ab999be828fb0868b64ea00b98a5ea4 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Thu, 25 Sep 2008 22:40:25 +0000
Subject: [PATCH] pthread-ubik-volser-stupidity-20080925

LICENSE IPL10

make volserver build again for not pthreaded ubik
---
 Makefile.in             | 13 +++++++------
 src/tvolser/Makefile.in | 17 +++++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c03942d62..5ba4e8ca3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,13 +291,14 @@ volser: cmd comerr tviced usd kauth audit
 	${COMPILE_PART1} volser ${COMPILE_PART2}
 
 tvolser: project tviced usd libafsrpc libafsauthent volser
-	[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in	\
-	alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*)   \
-		${COMPILE_PART1} tvolser  ${COMPILE_PART2} ;;           \
-	*_darwin_[1-6][0-9])                                            \
+	@case ${SYS_NAME} in						\
+	*_darwin_[1-6][0-9])						\
 		echo Not building MT volser for ${SYS_NAME} ;;          \
-	*_darwin_*)                                                     \
-		${COMPILE_PART1} tvolser ${COMPILE_PART2} ;;            \
+	*_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*)   \
+		${COMPILE_PART1} tvolser ${COMPILE_PART2} ;             \
+		if [ "xyes" = "x$(ENABLE_PTHREADED_UNIK)" ] ; then	\
+			$(MAKE) $(COMPILE_PART2B)_vos;  					\
+		fi;;							\
 	*)                                                              \
 		echo Not building MT volser for ${SYS_NAME} ;;          \
 	esac
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index d21c25759..0f614ff6d 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -61,10 +61,11 @@ LIBS=	${TOP_LIBDIR}/libcmd.a          \
 	${TOP_LIBDIR}/libafsauthent.a   \
 	${TOP_LIBDIR}/libafsrpc.a       \
 	${TOP_LIBDIR}/libafsutil.a      \
-	${TOP_LIBDIR}/libubik_pthread.a \
 	${TOP_LIBDIR}/libusd.a
 
-all: volserver vos
+all: volserver 
+
+all_vos: vos
 
 COMPILE=${CC} ${CFLAGS} -c $?
 
@@ -224,21 +225,25 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c
 vos.o: ${VOLSER}/vos.c
 	${COMPILE}
 
-vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS}
-	${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
+vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
+	${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a ${MT_LIBS} ${XLIBS}
 
 volserver: ${objects} ${LIBS}
 	${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
 
-install: volserver vos
+install: volserver
 	${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
 	${INSTALL} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
+
+install_vos: vos
 	${INSTALL} vos ${DESTDIR}${afssrvsbindir}/vos
 	${INSTALL} vos ${DESTDIR}${sbindir}/vos
 
-dest: volserver vos
+dest: volserver
 	${INSTALL} -d ${DEST}/root.server/usr/afs/bin
 	${INSTALL} volserver ${DEST}/root.server/usr/afs/bin/volserver
+
+dest_vos: vos
 	${INSTALL} vos ${DEST}/root.server/usr/afs/bin/vos
 	${INSTALL} vos ${DEST}/etc/vos
 
-- 
2.39.5