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

diff --git a/src/Makefile b/src/Makefile
index ac5937b..3c2f39b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ INSTALL=${SRCDIR}bin/install
 WASHTOOL=${SRCDIR}bin/washtool
 
 #WASHTOOLRCSUPDATE=${WASHTOOL} rcsupdate
-WASHTOOLCMD=make
+WASHTOOLCMD=$(MAKE)
 WASHTOOLFLAGS=-argument install
 
 COMPILE_PART1=${WASHTOOL} ${WASHTOOLCMD}
@@ -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}"; \
@@ -69,7 +69,7 @@ comerr: basics util
 cmd: basics comerr
 	${COMPILE_PART1} cmd ${COMPILE_PART2}
 	@case ${SYS_NAME} in \
-	sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* ) \
+	sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* | sparc64_linux* ) \
 		${COMPILE_PART1} cmd ${COMPILE_PART2} install64 ;; \
 	esac
 
@@ -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}
@@ -444,7 +445,7 @@ libafs_setup: config minproject export
 # Warning: The next few lines are _extremely_ sensitive to spaces and tabs.
 	${WASHTOOL} object libafs
 	case ${SYS_NAME} in \
-	alpha_dux4* ) \
+	alpha_dux* ) \
 		MKAFS_OSTYPE=DUX;; \
 	hp_ux* ) \
 		MKAFS_OSTYPE=HPUX;; \
@@ -475,7 +476,7 @@ libuafs_setup: config minproject export
 		MKAFS_OSTYPE=AIX;; \
 	sun4x_5* ) \
 		MKAFS_OSTYPE=SOLARIS;; \
-	alpha_dux4* ) \
+	alpha_dux* ) \
 		MKAFS_OSTYPE=DUX;; \
 	sgi_6* ) \
 		MKAFS_OSTYPE=IRIX;; \
@@ -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;