Browse Source

stop supporting SUDO builds. Something better is coming, so let's

align everyone who is using SUDO builds towards the new strategy.
ok natano
OPENBSD_6_1
deraadt 8 years ago
parent
commit
6e7bb827b6
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      src/etc/Makefile

+ 5
- 5
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.434 2016/09/18 21:47:19 deraadt Exp $
# $OpenBSD: Makefile,v 1.435 2016/10/04 16:54:31 deraadt Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -221,8 +221,8 @@ distribution-etc-root-var: distrib-dirs
chown root:wheel ${DESTDIR}/var/sysmerge/etc.tgz chown root:wheel ${DESTDIR}/var/sysmerge/etc.tgz
distribution: distribution:
exec ${SUDO} ${MAKE} distribution-etc-root-var
cd .. && exec ${SUDO} ${MAKE} install
exec ${MAKE} distribution-etc-root-var
cd .. && exec ${MAKE} install
distrib-dirs: distrib-dirs:
if [ ! -d ${DESTDIR}/. ]; then \ if [ ! -d ${DESTDIR}/. ]; then \
@ -243,7 +243,7 @@ release:
release-sets: release-sets:
cd ${RELEASEDIR} && rm -f SHA256 cd ${RELEASEDIR} && rm -f SHA256
cd ../distrib/sets && exec ${SUDO} sh maketars ${OSrev}
cd ../distrib/sets && exec sh maketars ${OSrev}
sha: sha:
-cd ${RELEASEDIR}; \ -cd ${RELEASEDIR}; \
@ -262,7 +262,7 @@ release-sets: distribution kernels
distrib: distrib:
cd ../distrib && \ cd ../distrib && \
${MAKE} && exec ${SUDO} ${MAKE} install
${MAKE} && exec ${MAKE} install
.PHONY: distribution-etc-root-var distribution distrib-dirs \ .PHONY: distribution-etc-root-var distribution distrib-dirs \
release allarchs kernels release-sets m4 install-mtree \ release allarchs kernels release-sets m4 install-mtree \


Loading…
Cancel
Save