Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix long standing bug in `make build' with $DESTDIR:

Browse Source 
- during `make build' after /usr/share/mk has been installed, call
  make with `-m $DESTDIR/usr/share/mk'.
This commit is contained in:
mrg 2000-04-10 14:47:22 +00:00
parent cfadc0991a
commit 1ae7478b2a
2 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.111 2000/04/09 02:09:49 simonb Exp $ # $NetBSD: Makefile,v 1.112 2000/04/10 14:47:22 mrg Exp $
# This is the top-level makefile for building NetBSD. For an outline of # This is the top-level makefile for building NetBSD. For an outline of
# how to build a snapshot or release, as well as other release engineering # how to build a snapshot or release, as well as other release engineering
@ -50,6 +50,10 @@ HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
_J= -j${NBUILDJOBS} _J= -j${NBUILDJOBS}
.endif .endif
.if defined(DESTDIR)
_M=-m ${DESTDIR}/usr/share/mk
.endif
# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
@ -74,7 +78,7 @@ SUBDIR+= regress
regression-tests: regression-tests:
@echo Running regression tests... @echo Running regression tests...
@(cd ${.CURDIR}/regress && ${MAKE} regress) @(cd ${.CURDIR}/regress && ${MAKE} ${_M} regress)
.endif .endif
buildmsg: buildmsg:
@ -82,19 +86,21 @@ buildmsg:
@date @date
beforeinstall: beforeinstall:
.ifndef NODISTRIBDIRS
.ifndef DESTDIR .ifndef DESTDIR
(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
.else .else
(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs) (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
.endif .endif
.endif
afterinstall: afterinstall:
.if ${MKMAN} != "no" && !defined(_BUILD) .if ${MKMAN} != "no" && !defined(_BUILD)
${MAKE} whatis.db ${MAKE} ${_M} whatis.db
.endif .endif
whatis.db: whatis.db:
(cd ${.CURDIR}/share/man && ${MAKE} makedb) (cd ${.CURDIR}/share/man && ${MAKE} ${_M} makedb)
# wrt info/dir below: It's safe to move this over top of /usr/share/info/dir, # wrt info/dir below: It's safe to move this over top of /usr/share/info/dir,
# as the build will automatically remove/replace the non-pkg entries there. # as the build will automatically remove/replace the non-pkg entries there.
@ -113,8 +119,8 @@ build: buildmsg beforeinstall
.if ${MKSHARE} != "no" .if ${MKSHARE} != "no"
(cd ${.CURDIR}/share/mk && ${MAKE} install) (cd ${.CURDIR}/share/mk && ${MAKE} install)
.endif .endif
.if !defined(UPDATE) .if !defined(UPDATE) && !defined(NOCLEANDIR)
${MAKE} cleandir ${MAKE} ${_M} cleandir
.endif .endif
.if ${MKOBJDIRS} != "no" .if ${MKOBJDIRS} != "no"
${MAKE} obj ${MAKE} obj
@ -127,33 +133,35 @@ build: buildmsg beforeinstall
@false @false
.else .else
(cd ${.CURDIR}/gnu/usr.bin/egcs && \ (cd ${.CURDIR}/gnu/usr.bin/egcs && \
${MAKE} ${_J} dependall MKMAN=no && \ ${MAKE} ${_M} ${_J} dependall MKMAN=no && \
${MAKE} MKMAN=no install && ${MAKE} cleandir) ${MAKE} ${_M} MKMAN=no install && ${MAKE} ${_M} cleandir)
.endif .endif
.endif .endif
${MAKE} includes .if !defined(NOINCLUDES)
${MAKE} ${_M} includes
.endif
(cd ${.CURDIR}/lib/csu && \ (cd ${.CURDIR}/lib/csu && \
${MAKE} ${_J} MKMAN=no dependall && \ ${MAKE} ${_M} ${_J} MKMAN=no dependall && \
${MAKE} MKMAN=no install) ${MAKE} ${_M} MKMAN=no install)
(cd ${.CURDIR}/lib && \ (cd ${.CURDIR}/lib && \
${MAKE} ${_J} MKMAN=no MKINFO=no dependall && \ ${MAKE} ${_M} ${_J} MKMAN=no MKINFO=no dependall && \
${MAKE} MKMAN=no MKINFO=no install) ${MAKE} ${_M} MKMAN=no MKINFO=no install)
(cd ${.CURDIR}/gnu/lib && \ (cd ${.CURDIR}/gnu/lib && \
${MAKE} ${_J} MKMAN=no MKINFO=no dependall && \ ${MAKE} ${_M} ${_J} MKMAN=no MKINFO=no dependall && \
${MAKE} MKMAN=no MKINFO=no install) ${MAKE} ${_M} MKMAN=no MKINFO=no install)
.if target(cryptobuild) .if target(cryptobuild)
${MAKE} ${_J} cryptobuild ${MAKE} ${_M} ${_J} cryptobuild
.endif .endif
${MAKE} ${_J} dependall && ${MAKE} _BUILD= install ${MAKE} ${_M} ${_J} dependall && ${MAKE} ${_M} _BUILD= install
.if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM) .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)
(cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_J} _SLAVE_BUILD= build) (cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_M} ${_J} _SLAVE_BUILD= build)
.endif .endif
${MAKE} whatis.db ${MAKE} ${_M} whatis.db
@echo -n "Build finished at: " @echo -n "Build finished at: "
@date @date
.endif .endif
release snapshot: build release snapshot: build
(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) (cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release)
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

12
share/mk/bsd.subdir.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.subdir.mk,v 1.32 2000/03/11 14:51:40 aidan Exp $ # $NetBSD: bsd.subdir.mk,v 1.33 2000/04/10 14:47:23 mrg Exp $
# @(#)bsd.subdir.mk 8.1 (Berkeley) 6/8/93 # @(#)bsd.subdir.mk 8.1 (Berkeley) 6/8/93
.if !target(__initialized__) .if !target(__initialized__)
@ -18,6 +18,12 @@ __REALSUBDIR+=${dir}
.endif .endif
.endfor .endfor
.if defined(DESTDIR) && !defined(_USE_INSTALLED_MK)
_M=-m ${DESTDIR}/usr/share/mk
.else
_M=
.endif
.for dir in ${__REALSUBDIR} .for dir in ${__REALSUBDIR}
.for targ in ${TARGETS} .for targ in ${TARGETS}
.PHONY: ${targ}-${dir} .PHONY: ${targ}-${dir}
@ -25,12 +31,12 @@ ${targ}-${dir}: .MAKE
@case "${dir}" in /*) \ @case "${dir}" in /*) \
echo "${targ} ===> ${dir}"; \ echo "${targ} ===> ${dir}"; \
cd ${dir}; \ cd ${dir}; \
${MAKE} "_THISDIR_=${dir}/" ${targ}; \ ${MAKE} ${_M} "_THISDIR_=${dir}/" ${targ}; \
;; \ ;; \
*) \ *) \
echo "${targ} ===> ${_THISDIR_}${dir}"; \ echo "${targ} ===> ${_THISDIR_}${dir}"; \
cd ${.CURDIR}/${dir}; \ cd ${.CURDIR}/${dir}; \
${MAKE} "_THISDIR_=${_THISDIR_}${dir}/" ${targ}; \ ${MAKE} ${_M} "_THISDIR_=${_THISDIR_}${dir}/" ${targ}; \
;; \ ;; \
esac esac
subdir-${targ}: ${targ}-${dir} subdir-${targ}: ${targ}-${dir}