samurai.patch

diff --git a/components/developer/samurai/Makefile b/components/developer/samurai/Makefile
index e9534f9d0..17a5cafcc 100644
--- a/components/developer/samurai/Makefile
+++ b/components/developer/samurai/Makefile
@@ -33,6 +33,6 @@ include $(WS_MAKE_RULES)/common.mk

 COMPONENT_BUILD_ENV += CC="/usr/bin/gcc"
 COMPONENT_BUILD_ARGS += CC="/usr/bin/gcc"
-COMPONENT_INSTALL_ARGS += PREFIX=$(PROTOUSRDIR)
+COMPONENT_INSTALL_ARGS += PREFIX=/usr DESTDIR=$(PROTO_DIR)
 # Auto-generated dependencies
 REQUIRED_PACKAGES += system/library
diff --git a/components/developer/samurai/manifests/sample-manifest.p5m b/components/developer/samurai/manifests/sample-manifest.p5m
index 7b7c8f6f5..0c1a23154 100644
--- a/components/developer/samurai/manifests/sample-manifest.p5m
+++ b/components/developer/samurai/manifests/sample-manifest.p5m
@@ -23,5 +23,5 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

-file path=/usr/bin/samu
-file path=/usr/share/man/man1/samu.1
+file path=usr/bin/samu
+file path=usr/share/man/man1/samu.1