--- a/open-src/common/Makefile.inc	Tue May 04 15:58:18 2010 -0700
+++ b/open-src/common/Makefile.inc	Wed May 05 14:06:42 2010 -0700
@@ -348,26 +348,26 @@
 	touch $(PATCHED_TARGET)
 
 # Step 4: Apply common Solaris changes to man pages in $(SUNTOUCHED_MANPAGES)
-FIXED_MAN_TARGET_FILE=.mantouch.done
-FIXED_MAN_TARGET=$(SOURCE_DIR)/$(FIXED_MAN_TARGET_FILE)
+FIXED_MAN_SUFFIX=mantouch.done
+FIXED_MAN_TARGET=$(SUNTOUCHED_MANPAGES:%=$(SOURCE_DIR)/%.$(FIXED_MAN_SUFFIX))
 fixed_man: $(FIXED_MAN_TARGET)
 
 COMMON_SUNTOUCH_MAN_FLAGS = \
 	-a '{Availability, $(SUN_PACKAGE)}' \
 	-a '{Interface Stability, $(MODULE_STABILITY)}'
 
-SUNTOUCH_MAN_FLAGS = \
+DEFAULT_SUNTOUCH_MAN_FLAGS = \
 	$(COMMON_SUNTOUCH_MAN_FLAGS) \
 	$(MODTYPE_SUNTOUCH_MAN_FLAGS) \
 	$(MODULE_SUNTOUCH_MAN_FLAGS)
 
-$(FIXED_MAN_TARGET): $(PATCHED_TARGET)
-	@if [[ "$(SUNTOUCHED_MANPAGES)" != "" ]] ; then \
-	    $(START_CMD_ECHO) ; \
-	    $(PERL) $(TOP)/common/suntouch-manpages.pl $(SUNTOUCH_MAN_FLAGS) \
-		$(SUNTOUCHED_MANPAGES:%=$(SOURCE_DIR)/%) ; \
-	fi
-	touch $(FIXED_MAN_TARGET)
+SUNTOUCH_MAN_FLAGS_DEFAULT	= $(SUNTOUCH_MAN_FLAGS_SET:yes=$(POUND_SIGN))
+$(SUNTOUCH_MAN_FLAGS_DEFAULT)	SUNTOUCH_MAN_FLAGS = $(DEFAULT_SUNTOUCH_MAN_FLAGS)
+
+$(FIXED_MAN_TARGET): $(PATCHED_TARGET) $(SOURCE_ADD_TARGET)
+	$(PERL) $(TOP)/common/suntouch-manpages.pl $(SUNTOUCH_MAN_FLAGS) \
+		$(@:%.$(FIXED_MAN_SUFFIX)=%)
+	touch $@
 
 # Step 5: Apply common Solaris changes to pkg-config *.pc files listed in
 # $(FIX_PC_FILES)