--- a/components/ggrep/Makefile	Thu Feb 10 09:25:14 2011 -0800
+++ b/components/ggrep/Makefile	Thu Feb 10 10:54:36 2011 -0800
@@ -40,20 +40,9 @@
 CONFIGURE_OPTIONS  +=		--program-prefix=g
 
 PROGS =		egrep fgrep grep
-PROTOSFWLINKS = $(PROGS:%=$(PROTOSFWBIN)/%)
-PROTOGNULINKS = $(PROGS:%=$(PROTOGNUBIN)/%)
-
-MAN1FILES =	$(PROGS:%=%.1)
-PROTOGNUMAN1LINKS = $(MAN1FILES:%=$(PROTOGNUSHAREMAN1)/%)
-
-$(PROTOSFWLINKS):	$(PROTOSFWBIN)
-	$(RM) $@ ; $(SYMLINK) ../../bin/g$(@F) $@
-
-$(PROTOGNULINKS):	$(PROTOGNUBIN)
-	$(RM) $@ ; $(SYMLINK) ../../bin/g$(@F) $@
-
-$(PROTOGNUMAN1LINKS):		$(PROTOGNUSHAREMAN1)
-	$(RM) $@ ; $(SYMLINK) ../../../../share/man/man1/g$(@F) $@
+GNUPROGS = $(PROGS)
+GNUMAN1=   $(PROGS:%=%.1)
+SFWPROGS = $(PROGS:%=g%)
 
 include ../../make-rules/shared-targets.mk