--- a/usr/src/cmd/emacs/Makefile.sfw	Thu Mar 18 16:36:00 2010 +0200
+++ b/usr/src/cmd/emacs/Makefile.sfw	Tue Apr 06 16:00:14 2010 +0300
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile.sfw	1.3	09/10/29 SMI"
+# ident	"@(#)Makefile.sfw	1.4	10/03/16 SMI"
 
 VER=23.1
 EMACSDIST=emacs-$(VER)
@@ -189,26 +189,26 @@
 	cp $(EMACSDIST)/doc/man/ctags.1 $(PGSHAREMAN1)/ctags.1
 
 $(PSHAREMAN1)/% $(PGSHAREMAN1)/%: $(EMACSDIST)/doc/man/%
-	perl tools/sunman.pl SUNWgnu-emacs < $< > $@
+	perl tools/sunman.pl editor/gnu-emacs < $< > $@
 
 # Manpages lacking from the emacs distribution that we supply
 #
 # The emacs binaries come in their own packages
 # 
 $(PSHAREMAN1)/emacs-x.1: augment/man/man1/emacs-x.1
-	perl tools/sunman.pl SUNWgnu-emacs-x \
+	perl tools/sunman.pl editor/gnu-emacs/gnu-emacs-x11 \
 		< augment/man/man1/emacs-x.1 > $(PSHAREMAN1)/emacs-x.1
 
 $(PSHAREMAN1)/emacs-nox.1: augment/man/man1/emacs-nox.1
-	perl tools/sunman.pl SUNWgnu-emacs-nox \
+	perl tools/sunman.pl editor/gnu-emacs/gnu-emacs-no-x11 \
 		< augment/man/man1/emacs-nox.1 > $(PSHAREMAN1)/emacs-nox.1
 
 $(PSHAREMAN1)/emacs-gtk.1: augment/man/man1/emacs-gtk.1
-	perl tools/sunman.pl SUNWgnu-emacs-gtk \
+	perl tools/sunman.pl editor/gnu-emacs/gnu-emacs-gtk \
 		< augment/man/man1/emacs-gtk.1 > $(PSHAREMAN1)/emacs-gtk.1
 
 $(PSHAREMAN1)/%: augment/man/man1/%
-	perl tools/sunman.pl SUNWgnu-emacs < $< > $@
+	perl tools/sunman.pl editor/gnu-emacs < $< > $@
 
 
 $(LIBDIRSYMLINK): $(LIBDIR)