mergemaster fixup
Erik Paulsen Skaalerud
erik at pentadon.com
Mon Dec 15 08:09:16 PST 2003
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'
More information about the Submit
mailing list