diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-02 21:47:34 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-02 21:47:34 +0000 |
| commit | bd43576233137aa739af9172ee6c28075bbb3e1e (patch) | |
| tree | 5ef16b7e184604ebfd0a140496c33455e99c3ccc | |
| parent | 75270b2b75b8e388dd304825984881c35c219bc7 (diff) | |
Provide a method to do prerequisites needed before
installation of includes can happen. Do these before and not run via ${SUDO}.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | include/Makefile | 14 | ||||
| -rw-r--r-- | lib/libssl/Makefile.bsd-wrapper | 6 |
3 files changed, 19 insertions, 5 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.48 1999/02/02 08:53:32 imp Exp $ +# $OpenBSD: Makefile,v 1.49 1999/03/02 21:47:32 niklas Exp $ # # For more information on building in tricky environments, please see @@ -77,7 +77,7 @@ build: rm -f ${GLOBAL_AUTOCONF_CACHE} .endif (cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install) - (cd ${.CURDIR}/include; ${SUDO} ${MAKE} includes) + (cd ${.CURDIR}/include; ${MAKE} prereq; ${SUDO} ${MAKE} includes) ${SUDO} ${MAKE} cleandir (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \ ${SUDO} ${MAKE} install) diff --git a/include/Makefile b/include/Makefile index 7d2aa186cf0..67a6e3e9406 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.60 1999/02/26 00:54:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.61 1999/03/02 21:47:33 niklas Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -33,16 +33,22 @@ DIRS= arpa protocols rpc rpcsvc LDIRS= dev net netinet netinet6 netccitt netiso netns netipx nfs sys ufs vm ddb \ scsi netatalk isofs xfs +# Directories with an includes target RDIRS= ../lib/libc_r ../lib/libcom_err ../lib/libcompat ../lib/libcurses \ ../lib/libform ../lib/libmenu ../lib/libocurses ../lib/libossaudio \ ../lib/libpanel ../lib/librpcsvc ../lib/libskey ../lib/libedit \ ../lib/libpcap ../lib/libutil ../lib/libwrap ../lib/libz \ ../sys/arch/${MACHINE} +# Directories with an includes target that use Makefile.bsd-wrapper WDIRS= ../lib/libssl ../gnu/lib/libg++/libg++ ../gnu/lib/libg++/libio \ ../gnu/lib/libg++/librx ../gnu/lib/libg++/libstdc++ \ ../gnu/usr.bin/gcc ../gnu/lib/libgmp +# Places using Makefile.bsd-wrapper that needs a prerequisite target met +# before includes +PWDIRS= ../lib/libssl + NOOBJ= noobj # Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies @@ -52,6 +58,12 @@ SYS_INCLUDE?= copies RDIRS+= ../kerberosIV/include ../kerberosIV/kadm ../kerberosIV/krb .endif +prereq: + @-for i in ${PWDIRS}; do \ + echo preparing in ${.CURDIR}/$$i; \ + (cd ${.CURDIR}/$$i; ${MAKE} -f Makefile.bsd-wrapper prereq) \ + done + includes: @echo installing ${FILES} @-for i in ${FILES}; do \ diff --git a/lib/libssl/Makefile.bsd-wrapper b/lib/libssl/Makefile.bsd-wrapper index 05596a4641d..7c37981c64f 100644 --- a/lib/libssl/Makefile.bsd-wrapper +++ b/lib/libssl/Makefile.bsd-wrapper @@ -51,12 +51,14 @@ SSL_SRC=src-patent SSL_SRC=src .endif -all: ${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h +all: prereq (cd ${.OBJDIR}; ${MAKE}) -includes: ${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h +includes: prereq (cd ${.OBJDIR}; ${MAKE} includes) +prereq: ${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h + install: (cd ${.OBJDIR}; ${MAKE} install) |