From af79c6e5455d4b16549d3124ac9b6c39c8bfb21a Mon Sep 17 00:00:00 2001 From: Eirik Nygaard Date: Tue, 16 Dec 2003 15:03:51 +0000 Subject: [PATCH] * Let mergemaster look for make.conf in the correct path. Submitted-by: Erik Paulsen Skaalerud --- usr.sbin/mergemaster/mergemaster.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index c4bfce2516..8fd477641c 100644 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -9,7 +9,7 @@ # DougB@FreeBSD.org # $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.46 2003/05/03 06:35:19 dougb Exp $ -# $DragonFly: src/usr.sbin/mergemaster/mergemaster.sh,v 1.4 2003/07/28 06:28:23 rob Exp $ +# $DragonFly: src/usr.sbin/mergemaster/mergemaster.sh,v 1.5 2003/12/16 15:03:51 eirikn Exp $ PATH=/bin:/usr/bin:/usr/sbin @@ -1044,7 +1044,7 @@ esac case "${PRE_WORLD}" in '') ;; *) - MAKE_CONF="${SOURCEDIR%etc}share/examples/etc/make.conf" + MAKE_CONF="${SOURCEDIR%etc}etc/defaults/make.conf" (echo '' echo '*** Comparing make variables' -- 2.41.0