Attachment 144354 Details for Bug 191055 – Fix for bug 191054 and bug 191055

[patch] Fix for bug 191054 and bug 191055

fix-bsd-progs-mk.patch (text/plain), 1.29 KB, created by Enji Cooper on 2014-07-02 23:26:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Enji Cooper

Created: 2014-07-02 23:26:42 UTC

Size: 1.29 KB

patch

obsolete

>diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk
>index 8392707..47caa64 100644
>--- a/share/mk/bsd.progs.mk
>+++ b/share/mk/bsd.progs.mk
>@@ -66,7 +66,7 @@ UPDATE_DEPENDFILE ?= NO
> DEPENDFILE?= .depend.${PROG}
> # prog.mk will do the rest
> .else
>-all: ${PROGS}
>+all: ${FILES} ${PROGS} ${SCRIPTS}
> 
> # We cannot capture dependencies for meta mode here
> UPDATE_DEPENDFILE = NO
>@@ -80,7 +80,7 @@ UPDATE_DEPENDFILE = NO
> 
> .ifndef _RECURSING_PROGS
> # tell progs.mk we might want to install things
>-PROGS_TARGETS+= cleandepend cleandir cleanobj depend install
>+PROGS_TARGETS+= clean cleandepend cleandir cleanobj depend install
> 
> .for p in ${PROGS}
> .if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
>@@ -103,18 +103,15 @@ $p.$t: .PHONY .MAKE
> $t: ${PROGS:%=%.$t}
> .endfor
> 
>-SCRIPTS_TARGETS+= cleandepend cleandir cleanobj depend install
>+.if empty(PROGS) && !empty(SCRIPTS)
> 
>-.for p in ${SCRIPTS}
>-.for t in ${SCRIPTS_TARGETS:O:u}
>-$p.$t: .PHONY .MAKE
>-	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
>-	    SUBDIR= SCRIPT=$p ${x.$p} ${@:E})
>-.endfor
>+.for t in ${PROGS_TARGETS:O:u}
>+scripts.$t: .PHONY .MAKE
>+	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} SUBDIR= _RECURSING_PROGS= \
>+	    $t)
>+$t: scripts.$t
> .endfor
> 
>-.for t in ${SCRIPTS_TARGETS:O:u}
>-$t: ${SCRIPTS:%=%.$t}
>-.endfor
>+.endif
> 
> .endif

Actions: View | Diff

Attachments on bug 191055: 144354