summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.sh
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2000-11-09 00:19:21 +0000
committerdougb <dougb@FreeBSD.org>2000-11-09 00:19:21 +0000
commit7e3691b30c4894e6d7164fdecacef26692068f25 (patch)
treed14537e41b8dbaa06ad340a5f673245228bf8591 /usr.sbin/mergemaster/mergemaster.sh
parent3da55b7c31518dd4702aeb736a945cd8fa080bc2 (diff)
downloadFreeBSD-src-7e3691b30c4894e6d7164fdecacef26692068f25.zip
FreeBSD-src-7e3691b30c4894e6d7164fdecacef26692068f25.tar.gz
* Reduce diffs to RELENG_4 by specifying a full path to sysctl
* Adjust a little whitespace * Make the distrib-dirs/mtree on DESTDIR conditional on user actually specifying a DESTDIR. This seemed like a safe way to get the right directories and permissions in the installed tree since 'make installworld' does the same thing, but in practice too many people have custom hacks that we should leave unmolested. Still need to find a way to deal with 'install -d' and permissions on nonexistent directories in the middle of the path, but this is at least no worse that it was before. PR: bin/22661
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.sh')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index e7aee6a..1f4d31a 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -10,7 +10,7 @@
# $FreeBSD$
-PATH=/bin:/usr/bin:/usr/sbin:/sbin
+PATH=/bin:/usr/bin:/usr/sbin
display_usage () {
VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`
@@ -124,6 +124,7 @@ diff_loop () {
echo ''
if mm_install "${COMPFILE}"; then
echo " *** ${COMPFILE} installed successfully"
+ echo ''
# Make the list print one file per line
AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES} ${DESTDIR}${COMPFILE#.}
"
@@ -428,7 +429,12 @@ case "${RERUN}" in
esac
{ cd ${SOURCEDIR} &&
- make DESTDIR=${DESTDIR} distrib-dirs &&
+ case "${DESTDIR}" in
+ '') ;;
+ *)
+ make DESTDIR=${DESTDIR} distrib-dirs
+ ;;
+ esac
make DESTDIR=${TEMPROOT} distrib-dirs &&
make DESTDIR=${TEMPROOT} -DNO_MAKEDEV distribution;} ||
{ echo '';
@@ -475,7 +481,7 @@ case "${RERUN}" in
esac
# Avoid trying to update MAKEDEV if /dev is on a devfs
- if sysctl vfs.devfs.generation > /dev/null 2>&1 ; then
+ if /sbin/sysctl vfs.devfs.generation > /dev/null 2>&1 ; then
rm ${TEMPROOT}/dev/MAKEDEV ${TEMPROOT}/dev/MAKEDEV.local
fi
OpenPOWER on IntegriCloud