5 files changed, 27 insertions, 25 deletions
diff --git a/usr/src/cmd/dtrace/test/cmd/baddof/Makefile b/usr/src/cmd/dtrace/test/cmd/baddof/Makefile
index 97cdd58b22..19716a5867 100644
--- a/usr/src/cmd/dtrace/test/cmd/baddof/Makefile
+++ b/usr/src/cmd/dtrace/test/cmd/baddof/Makefile
@@ -33,6 +33,7 @@ ROOTOPTPKG = $(ROOT)/opt/SUNWdtrt
 ROOTBIN = $(ROOTOPTPKG)/bin
 
 LDFLAGS += -znodefs -ztextoff
+LDLIBS = $(LDLIBS.cmd)
 LDLIBS += -ldtrace
 
 SRCS = baddof
diff --git a/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile b/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile
index 4e13d02017..e09430c1cf 100644
--- a/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile
+++ b/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile
@@ -33,6 +33,7 @@ ROOTOPTPKG = $(ROOT)/opt/SUNWdtrt
 ROOTBIN = $(ROOTOPTPKG)/bin
 
 LDFLAGS += -znodefs -ztextoff
+LDLIBS = $(LDLIBS.cmd)
 LDLIBS += -ldtrace
 
 SRCS = badioctl
diff --git a/usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com b/usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com
index f36528680d..f1f7dc39b7 100644
--- a/usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com
+++ b/usr/src/cmd/dtrace/test/cmd/chkargs/Makefile.com
@@ -32,6 +32,7 @@ ROOTBIN32 = $(ROOTBIN)/$(MACH32)
 ROOTBIN64 = $(ROOTBIN)/$(MACH64)
 
 PROG = chkargs
+LDLIBS = $(LDLIBS.cmd)
 LDLIBS += -ldtrace -lctf
 
 ROOTISAEXEC = $(ROOTBIN)/$(PROG)
diff --git a/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile b/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
index 7ac38c9ff6..119e153a9a 100644
--- a/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
+++ b/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
@@ -48,7 +48,7 @@ MANIFESTDIR=manifest
 MANIFEST=$(MANIFESTDIR)/jdtrace.jar-manifest
 JDTRACE_JAR=$(LIBDIR)/jdtrace.jar
 
-JAR=$(ROOTLIBJAVA)/jdtrace.jar
+PROTO_JDTRACE_JAR=$(ROOTLIBJAVA)/jdtrace.jar
 CMD = $(ROOTBIN)/jdtrace
 XLIST = $(ROOTBIN)/exception.lst
 
@@ -57,28 +57,28 @@ $(CMD) := FILEMODE = 0555
 default: $(JDTRACE_JAR) jdtrace.exe
 
 clean:
-	rm -f $(CLASSDIR)/*.class
+	$(RM) $(CLASSDIR)/*.class
 
 clobber: clean
-	rm -f $(JDTRACE_JAR)
-	rm -f jdtrace.exe
+	$(RM) $(JDTRACE_JAR)
+	$(RM) jdtrace.exe
 
 all: default
 
 lint:
 
-install: all $(JAR) $(CMD) $(XLIST)
+install: all $(PROTO_JDTRACE_JAR) $(CMD) $(XLIST)
 
 jdtrace.exe: $(SRCDIR)/jdtrace.c
-	cc -I/usr/include $(SRCDIR)/jdtrace.c -o jdtrace.exe
+	$(CC) -I/usr/include $(SRCDIR)/jdtrace.c -o jdtrace.exe
 
 $(JDTRACE_JAR): $(SRCDIR)/JDTrace.java $(SRCDIR)/Getopt.java
-	mkdir -p $(CLASSDIR)
-	mkdir -p $(LIBDIR)
-	javac -cp $(CLASSPATH) -d $(CLASSDIR) $(SRCDIR)/*.java
-	jar -cmf $(MANIFEST) $(JDTRACE_JAR) -C $(CLASSDIR) .
+	@mkdir -p $(CLASSDIR)
+	@mkdir -p $(LIBDIR)
+	$(JAVAC) -cp $(CLASSPATH) -d $(CLASSDIR) $(SRCDIR)/*.java
+	$(JAR) -cmf $(MANIFEST) $(JDTRACE_JAR) -C $(CLASSDIR) .
 
-$(JAR): $(ROOTLIBJAVA)
+$(PROTO_JDTRACE_JAR): $(ROOTLIBJAVA)
 
 $(CMD): $(ROOTBIN)
 
diff --git a/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile b/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
index 294280efbf..6e09f49550 100644
--- a/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
+++ b/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
@@ -29,8 +29,7 @@ include $(SRC)/Makefile.master
 
 ROOTOPTPKG = $(ROOT)/opt/SUNWdtrt
 JAR_DSTDIR = $(ROOTOPTPKG)/tst/common/java_api
-DTEST_DIR=$(SRC)/cmd/dtrace/test
-JARDIR = $(DTEST_DIR)/tst/common/java_api
+JAR_SRCDIR = $(SRC)/cmd/dtrace/test/tst/common/java_api
 
 # Use the proto dtrace.jar if it exists, otherwise use whatever is
 # installed on the system. It should be possible to build
@@ -44,32 +43,32 @@ SRCDIR=src
 CLASSDIR=classes
 MANIFESTDIR=manifest
 MANIFEST=$(MANIFESTDIR)/test.jar-manifest
-JAR=$(JARDIR)/test.jar
-JAR_DST=$(JAR_DSTDIR)/test.jar
+TEST_JAR=$(JAR_SRCDIR)/test.jar
+PROTO_TEST_JAR=$(JAR_DSTDIR)/test.jar
 
-default: $(JAR)
+default: $(TEST_JAR)
 
 clean:
-	rm -f $(CLASSDIR)/*.class
+	$(RM) $(CLASSDIR)/*.class
 
 clobber: clean
-	rm -f $(JAR)
+	$(RM) $(TEST_JAR)
 
 all: default
 
 lint:
 
-install: all $(JAR_DST)
+install: all $(PROTO_TEST_JAR)
 
-$(JAR): $(SRCDIR)/*.java
-	mkdir -p $(CLASSDIR)
-	javac -cp $(CLASSPATH) -d $(CLASSDIR) $(SRCDIR)/*.java
-	jar -cmf $(MANIFEST) $(JAR) -C $(CLASSDIR) .
+$(TEST_JAR): $(SRCDIR)/*.java
+	@mkdir -p $(CLASSDIR)
+	$(JAVAC) -cp $(CLASSPATH) -d $(CLASSDIR) $(SRCDIR)/*.java
+	$(JAR) -cmf $(MANIFEST) $(TEST_JAR) -C $(CLASSDIR) .
 
-$(JAR_DST): $(JAR_DSTDIR)
+$(PROTO_TEST_JAR): $(JAR_DSTDIR)
 
 $(JAR_DSTDIR):
 	$(INS.dir)
 
-$(JAR_DSTDIR)/%: $(JARDIR)/%
+$(JAR_DSTDIR)/%: $(JAR_SRCDIR)/%
 	$(INS.file)