--- a/usr/src/Makefile.env	Fri May 18 11:08:12 2012 -0400
+++ b/usr/src/Makefile.env	Fri May 18 10:17:34 2012 -0700
@@ -131,14 +131,23 @@
 
 JAVA = $(JAVA_HOME)/bin/java
 
-# Consumers must depend on java (or java/adr)
-ADRDIR=$(SRC)/java/adr
-ADRLOC=$(ADRDIR)/adr.jar
-RADADRGEN = $(ENV) \
-	RADADR_SCHEMA=$(ADRDIR)/xml/rng/radadr.rng.1 \
-	RADADR_XSLDIR=$(ADRDIR)/xml/style \
-	RADADR_JARDIR=$(ADRDIR) \
-	$(ADRDIR)/radadrgen.sh
+RADADRGEN_ENV = \
+	if [ "$(ROOT)" == "/" ]; \
+	then \
+		echo $(ENV); \
+		echo RADADR_SCHEMA=/usr/share/lib/xml/rng/radadr.rng.1; \
+		echo RADADR_XSLDIR=/usr/share/lib/xml/style; \
+		echo RADADR_JARDIR=/usr/lib/rad/java; \
+		echo /usr/bin/radadrgen ; \
+	else \
+		echo $(ENV); \
+		echo RADADR_SCHEMA=$(SRC)/java/adr/xml/rng/radadr.rng.1; \
+		echo RADADR_XSLDIR=$(SRC)/java/adr/xml/style; \
+		echo RADADR_JARDIR=$(SRC)/java/adr/; \
+		echo $(SRC)/java/adr/radadrgen.sh; \
+	fi
+
+RADADRGEN = $(RADADRGEN_ENV:sh)
 
 # Lint
 LINTFLAGS = -s -errtags=yes -errsecurity=core -errwarn=%all

--- a/usr/src/test/setup/setup_remote_rad.sh	Fri May 18 11:08:12 2012 -0400
+++ b/usr/src/test/setup/setup_remote_rad.sh	Fri May 18 10:17:34 2012 -0700
@@ -72,28 +72,11 @@
 #
 # Copy sources to remote host.
 #
-# $1 = RAD args
-#
 archive()
 {
-	mkdir -p $TEST_DIR
-
-	# Copy root directory.
-	cd $ROOT
-	find . | cpio -dumpv $TEST_DIR > /dev/null 2>&1
-
-	# Archive sources.
-	cd $TMP_DIR
-	tar cf $TEST_DIRNAME.tar $TEST_DIRNAME
-
-	# Copy source to remote host.
-	scp $TEST_DIRNAME.tar $LOGIN:$TMP_DIR
-	ssh $LOGIN "cd $TMP_DIR; tar xf $TEST_DIRNAME.tar; rm $TEST_DIRNAME.tar"
-
-	rm -rf $TEST_DIRNAME.tar
-
-} ## end archive()
-
+	ssh $LOGIN "mkdir -p $TEST_DIR; cd $TEST_DIR; \
+	    tar -cf - -C $ROOT usr/lib/rad | tar -xf -"
+} 
 
 #
 # Generate certs for TLS assertion tests.