X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2FMakefile;h=3c2f39b535717eb09eceb5d42f94ed390e782931;hp=8d528f9a7afd833fb820e1134499a01664d69c3e;hb=3531babbd25ac18deacd7bf1cc170327411c2a4a;hpb=d089415117684aea0f975e036615433b6c94f1b0

diff --git a/src/Makefile b/src/Makefile
index 8d528f9..3c2f39b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,7 +32,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 all:
 	set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
-	$(MAKE) install "COMPILE_PART1=cd obj; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME} "WASHTOOL=echo No washtool: "
+	$(MAKE) install "COMPILE_PART1=cd obj; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME} "WASHTOOL=echo No washtool: "
 
 basics:
 	-if test -f "${WASHTOOL}"; \
@@ -95,7 +95,7 @@ rxincls: rxobj
 	${COMPILE_PART1} rx ${COMPILE_PART2}
 
 rxtests: rxobj
-	${COMPILE_PART1} rx ${COMPILE_PART2}
+	${COMPILE_PART1} rx ${COMPILE_PART3}
 
 fsint: project kfsint
 
@@ -138,8 +138,9 @@ auth: project comerr des lwp rx sys rxkad audit
 ubik: project auth 
 	${COMPILE_PART1} ubik ${COMPILE_PART2}
 
+#	cd obj/ubik; $(MAKE) test SYS_NAME=${SYS_NAME} 
 ubiktests: ubik sys
-	cd obj/ubik; $(MAKE) test SYS_NAME=${SYS_NAME} 
+	${COMPILE_PART1} ubik ${COMPILE_PART3}
 
 ptserver: project ubik cmd comerr auth audit
 	${COMPILE_PART1} ptserver ${COMPILE_PART2}
@@ -522,12 +523,14 @@ links:
 	- /bin/rm -rf @sys/dest/* ;
 	- /bin/mkdir @sys/obj ;
 	echo "Create the obj directories"
+	here=`pwd` ; \
 	cd src; \
 	for file in `find [!NW]* -type d -print` ; do \
-		/bin/mkdir ../obj/$${file} ; \
+		/bin/mkdir $${here}/obj/$${file} ; \
 	done;
 	echo "Create the obj file links"
+	here=`pwd` ; \
 	cd src; \
 	for file in `find [!NW]* -type f -print` ; do \
-		/bin/ln -s `pwd`/$${file} ../obj/$${file} ; \
+		/bin/ln -s `pwd`/$${file} $${here}/obj/$${file} ; \
 	done;