--- a/components/make/make.p5m	Mon Jun 20 12:03:03 2011 -0700
+++ b/components/make/make.p5m	Mon Jun 20 12:42:00 2011 -0700
@@ -99,7 +99,7 @@
 dir path=usr/share/locale/zh_CN/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/gmake
+file usr/bin/gmake path=usr/gnu/bin/make
 file path=usr/share/info/make.info
 file path=usr/share/info/make.info-1
 file path=usr/share/info/make.info-2
@@ -126,14 +126,14 @@
 file path=usr/share/locale/uk/LC_MESSAGES/make.mo
 file path=usr/share/locale/vi/LC_MESSAGES/make.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/make.mo
-file path=usr/share/man/man1/gmake.1
+file usr/share/man/man1/gmake.1 path=usr/gnu/share/man/man1/make.1
 legacy pkg=SUNWgmake \
     desc="GNU make - A utility used to build software (gmake) 3.81" \
     name="gmake - GNU make"
 license make.license license=GPLv2
-link path=usr/gnu/bin/make target=../../bin/gmake
-link path=usr/gnu/share/man/man1/make.1 \
-    target=../../../../share/man/man1/gmake.1
-link path=usr/sfw/bin/gmake target=../../bin/gmake
+link path=usr/bin/gmake target=../gnu/bin/make facet.compat.gnulinks=true
+link path=usr/share/man/man1/gmake.1 \
+    target=../../../gnu/share/man/man1/make.1 facet.compat.gnulinks=true
+link path=usr/sfw/bin/gmake target=../../gnu/bin/make
 link path=usr/sfw/share/man/man1/gmake.1 \
-    target=../../../../share/man/man1/gmake.1
+    target=../../../../gnu/share/man/man1/make.1