diff -Naur openjdk/hotspot/make/linux/makefiles/sa.make openjdk-magellan/hotspot/make/linux/makefiles/sa.make
--- openjdk/hotspot/make/linux/makefiles/sa.make	2011-02-28 17:03:13.000000000 +0100
+++ openjdk-magellan/hotspot/make/linux/makefiles/sa.make	2012-01-05 19:37:48.692981560 +0100
@@ -45,8 +45,8 @@
 
 # gnumake 3.78.1 does not accept the *s that
 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
+AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
+AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
 
 SA_CLASSDIR = $(GENERATED)/saclasses
 
diff -Naur openjdk/hotspot/make/solaris/makefiles/sa.make openjdk-magellan/hotspot/make/solaris/makefiles/sa.make
--- openjdk/hotspot/make/solaris/makefiles/sa.make	2011-02-28 17:03:13.000000000 +0100
+++ openjdk-magellan/hotspot/make/solaris/makefiles/sa.make	2012-01-05 19:38:14.591981559 +0100
@@ -41,8 +41,8 @@
 
 # gnumake 3.78.1 does not accept the *s that
 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
+AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
+AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
 
 SA_CLASSDIR = $(GENERATED)/saclasses