Revert my previous commit to nrelease/Makefile and add /usr/local/share/man
authorSascha Wildner <swildner@dragonflybsd.org>
Thu, 26 Apr 2007 08:25:41 +0000 (08:25 +0000)
committerSascha Wildner <swildner@dragonflybsd.org>
Thu, 26 Apr 2007 08:25:41 +0000 (08:25 +0000)
to manpath.config.

Requested-by: dillon
gnu/usr.bin/man/manpath/manpath.config
nrelease/Makefile

index 80969f6..f360fbb 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.15.2.1 2003/02/14 22:38:14 nectar Exp $
-# $DragonFly: src/gnu/usr.bin/man/manpath/manpath.config,v 1.6 2007/03/25 11:35:11 swildner Exp $
+# $DragonFly: src/gnu/usr.bin/man/manpath/manpath.config,v 1.7 2007/04/26 08:25:41 swildner Exp $
 #
 # This file is read by manpath(1) to configure the mandatory manpath,
 # optional manpath and to map each path element to a manpath element.
@@ -25,6 +25,7 @@ OPTIONAL_MANPATH      /usr/freebsd_pkg/man
 MANPATH_MAP    /bin                    /usr/share/man
 MANPATH_MAP    /usr/bin                /usr/share/man
 MANPATH_MAP    /usr/local/bin          /usr/local/man
+MANPATH_MAP    /usr/local/bin          /usr/local/share/man
 MANPATH_MAP    /usr/pkg/xorg/bin       /usr/pkg/xorg/man
 MANPATH_MAP    /usr/X11R6/bin          /usr/X11R6/man
 #
index 8e112a6..b360d93 100644 (file)
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.61 2007/04/25 09:22:06 swildner Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.62 2007/04/26 08:25:41 swildner Exp $
 #
 
 # compat target
@@ -141,7 +141,6 @@ buildiso:
        done
        ln -s kernel ${ISOROOT}/kernel.BOOTP
        mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.local.dist -p ${ISOROOT}/usr/local/
-       ln -s /usr/local/man ${ISOROOT}/usr/local/share/man
        mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.var.dist -p ${ISOROOT}/var
        dev_mkdb -f ${ISOROOT}/var/run/dev.db ${ISOROOT}/dev