diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-10-04 16:54:32 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-10-04 16:54:32 +0000 |
| commit | 9172e696a13a394f11feeeae637c38e50925e8ac (patch) | |
| tree | a0e2449cfba75df2e5a390c9f3c29ecd5e7d9d69 | |
| parent | 77faa4438a0d3b8bf51618086a75aa400011f7f1 (diff) | |
stop supporting SUDO builds. Something better is coming, so let's
align everyone who is using SUDO builds towards the new strategy.
ok natano
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | etc/Makefile | 10 |
2 files changed, 14 insertions, 14 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.125 2015/08/23 14:22:56 deraadt Exp $ +# $OpenBSD: Makefile,v 1.126 2016/10/04 16:54:31 deraadt Exp $ # # For more information on building in tricky environments, please see @@ -50,7 +50,7 @@ regression-tests: @cd ${.CURDIR}/regress && ${MAKE} depend && exec ${MAKE} regress includes: - cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes + cd ${.CURDIR}/include && ${MAKE} prereq && exec ${MAKE} includes beforeinstall: cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} distrib-dirs @@ -72,15 +72,15 @@ build: .ifdef GLOBAL_AUTOCONF_CACHE cp /dev/null ${GLOBAL_AUTOCONF_CACHE} .endif - cd ${.CURDIR}/share/mk && exec ${SUDO} ${MAKE} install - cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes - ${SUDO} ${MAKE} cleandir + cd ${.CURDIR}/share/mk && exec ${MAKE} install + cd ${.CURDIR}/include && ${MAKE} prereq && exec ${MAKE} includes + ${MAKE} cleandir cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \ - NOMAN=1 exec ${SUDO} ${MAKE} install + NOMAN=1 exec ${MAKE} install cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \ - NOMAN=1 exec ${SUDO} ${MAKE} install - ${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install - ${SUDO} /bin/sh ${.CURDIR}/distrib/sets/makeetcset ${.CURDIR} ${MAKE} + NOMAN=1 exec ${MAKE} install + ${MAKE} depend && ${MAKE} && exec ${MAKE} install + /bin/sh ${.CURDIR}/distrib/sets/makeetcset ${.CURDIR} ${MAKE} .endif CROSS_TARGETS=cross-env cross-dirs cross-obj cross-includes cross-binutils \ diff --git a/etc/Makefile b/etc/Makefile index c24eb78da6e..5be76089576 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 LOCALTIME= Canada/Mountain @@ -221,8 +221,8 @@ distribution-etc-root-var: distrib-dirs chown root:wheel ${DESTDIR}/var/sysmerge/etc.tgz 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: if [ ! -d ${DESTDIR}/. ]; then \ @@ -243,7 +243,7 @@ release: release-sets: cd ${RELEASEDIR} && rm -f SHA256 - cd ../distrib/sets && exec ${SUDO} sh maketars ${OSrev} + cd ../distrib/sets && exec sh maketars ${OSrev} sha: -cd ${RELEASEDIR}; \ @@ -262,7 +262,7 @@ release-sets: distribution kernels distrib: cd ../distrib && \ - ${MAKE} && exec ${SUDO} ${MAKE} install + ${MAKE} && exec ${MAKE} install .PHONY: distribution-etc-root-var distribution distrib-dirs \ release allarchs kernels release-sets m4 install-mtree \ |