Page MenuHomeFreeBSD
Files F108306295

D41204.diff
No OneTemporary
Actions

D41204.diff
View Options

diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -214,15 +214,17 @@
mkdir -p $1/etc || return 1
cp -p $SRCDIR/$file $1/etc/$name || return 1
done
- elif ! [ -n "$nobuild" ]; then
- (cd $SRCDIR; $make DESTDIR=$destdir distrib-dirs &&
- MAKEOBJDIRPREFIX=$destdir/usr/obj $make _obj SUBDIR_OVERRIDE=etc &&
- MAKEOBJDIRPREFIX=$destdir/usr/obj $make everything SUBDIR_OVERRIDE=etc &&
- MAKEOBJDIRPREFIX=$destdir/usr/obj $make DESTDIR=$destdir distribution) || \
- return 1
else
- (cd $SRCDIR; $make DESTDIR=$destdir distrib-dirs &&
- $make DESTDIR=$destdir distribution) || return 1
+ (
+ cd $SRCDIR || exit 1;
+ if ! [ -n "$nobuild" ]; then
+ export MAKEOBJDIRPREFIX=$destdir/usr/obj;
+ $make _obj SUBDIR_OVERRIDE=etc || exit 1
+ $make everything SUBDIR_OVERRIDE=etc || exit 1
+ fi
+ $make DESTDIR=$destdir distrib-dirs || exit 1
+ $make DESTDIR=$destdir distribution || exit 1
+ ) || return 1
fi
chflags -R noschg $1 || return 1
rm -rf $1/usr/obj || return 1

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 24, 5:56 PM (17 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16094346
Default Alt Text
D41204.diff (1 KB)

Event Timeline