--- a/components/git/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/git/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -50,6 +50,8 @@
 COMPONENT_BUILD_ENV+=	NO_PERL_MAKEMAKER=1
 COMPONENT_INSTALL_ENV+=	PERL_LIB=$(shell /usr/perl5/$(PERL_VERSION)/bin/perl -MConfig -e 'print "$$Config{installvendorarch}"')
 
+COMPONENT_TEST_TARGETS = test
+
 #
 # This runs configure but configure doesn't generate a Makefile.
 # Instead a Makefile comes with git ...
@@ -69,7 +71,13 @@
 
 build:		$(BUILD_32) $(DOC)/.manpages
 
-install:	$(INSTALL_32) $(BUILD_DIR_32)/.manpages
+install:	$(INSTALL_32)
+
+#
+# tests fully pass when done in the archive directory.
+# fail here; probably due to the use of cloney.
+#
+test:	$(TEST_32)
 
 #
 # I know.  It's ugly.
@@ -79,58 +87,25 @@
 #
 $(DOC)/.manpages:
 	cd $(BUILD_DIR) ; $(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_1)
-	$(MKDIR) $(DOC)
+	$(MKDIR) $(@D)
 	cd $(BUILD_DIR)/man1 ; for manfile in *.1; \
 	do \
-		sed -f ../../solarisman-stability $$manfile > \
-			$(DOC)/$$manfile; \
+		name=`basename $$manfile .1`; \
+		cat $$manfile > $(DOC)/$$name.1; \
 	done
 	cd $(BUILD_DIR)/man5 ; for manfile in *.5; \
 	do \
 		name=`basename $$manfile .5`; \
-		sed 's/"5"/"4"/' $$manfile | \
-		sed -f ../../solarisman-stability > $(DOC)/$$name.4; \
+		sed 's/"5"/"4"/' $$manfile > $(DOC)/$$name.4; \
 	done
 	cd $(BUILD_DIR)/man7 ; for manfile in *.7; \
         do \
 		name=`basename $$manfile .7`; \
-		sed 's/"7"/"5"/' $$manfile | \
-		sed -f ../../solarisman-stability > $(DOC)/$$name.5; \
+		sed 's/"7"/"5"/' $$manfile > $(DOC)/$$name.5; \
 	done
-	@ touch $(DOC)/.manpages
-
-#
-# install manpages per architecture
-#
-$(BUILD_DIR_32)/.manpages:
-	$(MKDIR) $(PROTOUSRSHAREMAN1DIR)
-	$(MKDIR) $(PROTOUSRSHAREMAN4DIR)
-	$(MKDIR) $(PROTOUSRSHAREMAN5DIR)
-	cd $(DOC) ; for manfile in *.1; \
-	do \
-		$(RM) $(PROTOUSRSHAREMAN1DIR)/$$manfile; \
-		$(INSTALL) -m 0444 $$manfile $(PROTOUSRSHAREMAN1DIR); \
-	done
-	cd $(DOC) ; for manfile in *.4; \
-	do \
-		$(RM) $(PROTOUSRSHAREMAN4DIR)/$$manfile; \
-		$(INSTALL) -m 0444 $$manfile $(PROTOUSRSHAREMAN4DIR); \
-	done
-	cd $(DOC) ; for manfile in *.5; \
-	do \
-		$(RM) $(PROTOUSRSHAREMAN5DIR)/$$manfile; \
-		$(INSTALL) -m 0444 $$manfile $(PROTOUSRSHAREMAN5DIR); \
-	done
-	@ touch $(BUILD_DIR_32)/.manpages
+	$(TOUCH) $@
 
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-#
-# tests fully pass when done in the archive directory.
-# fail here; probably due to the use of cloney.
-#
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) test
-
 include ../../make-rules/depend.mk