diff options
| author | ru <ru@FreeBSD.org> | 2002-04-29 16:00:30 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-04-29 16:00:30 +0000 |
| commit | a6b94e0437225918f9a086966a24acad94e99adb (patch) | |
| tree | 658855a4ac2ee55cd0bf988ab6c9044d0429234e /share | |
| parent | 0a11a97a4361522a6dd6c43524563cb98ae5d367 (diff) | |
| download | FreeBSD-src-a6b94e0437225918f9a086966a24acad94e99adb.zip FreeBSD-src-a6b94e0437225918f9a086966a24acad94e99adb.tar.gz | |
Splitting "realinstall" into parts was a (failed) part of the work
in progress, and should not have been committed in revision 1.114.
This broke gnu/usr.bin/binutils/strip and usr.bin/strip makefiles;
they were now attempting to install and strip "strip" from objdir.
Pointed out by: bde
This has nothing to do with PR misc/37516.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.prog.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index f655c6e..ff4b0c1 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -103,9 +103,8 @@ _INSTALLFLAGS:= ${INSTALLFLAGS} _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor -realinstall: beforeinstall -realinstall: _proginstall -_proginstall: +.if !target(realinstall) +realinstall: .if defined(PROG) .if defined(PROGNAME) ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ @@ -119,8 +118,6 @@ _proginstall: (cd ${DESTDIR}${ORIGBINDIR}; ln -fs dm ${PROG}; \ chown -h ${BINOWN}:${ORIGBINGRP} ${PROG}) .endif - -realinstall: .if defined(LINKS) && !empty(LINKS) @set ${LINKS}; \ while test $$# -ge 2; do \ @@ -143,6 +140,8 @@ realinstall: ln -fs $$l $$t; \ done; true .endif +.endif !target(realinstall) +realinstall: beforeinstall .if defined(SCRIPTS) && !empty(SCRIPTS) realinstall: _scriptsinstall |
