DragonFly submit List (threaded) for 2003-12
[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index][Thread Index]

mergemaster fixup

From:	"Erik Paulsen Skaalerud" <erik@xxxxxxxxxxxx>
Date:	Mon, 15 Dec 2003 17:09:16 +0100

mergemaster -p looks for the defaults make.conf in the wrong place, this
patch fixes it.

Erik.

--- usr.sbin/mergemaster/mergemaster.orig       Mon Jul 28 08:28:23 2003
+++ usr.sbin/mergemaster/mergemaster.sh Mon Dec 15 17:06:01 2003
@@ -1044,7 +1044,7 @@
 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'

[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index][Thread Index]