Date: Wed, 23 Jan 2013 00:47:44 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245830 - projects/bmake/share/mk Message-ID: <201301230047.r0N0liDO081816@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Wed Jan 23 00:47:43 2013 New Revision: 245830 URL: http://svnweb.freebsd.org/changeset/base/245830 Log: If PROGNAME is set, we need to use stage_as rather than stage_files to control the name in the stage tree. Modified: projects/bmake/share/mk/bsd.prog.mk Modified: projects/bmake/share/mk/bsd.prog.mk ============================================================================== --- projects/bmake/share/mk/bsd.prog.mk Wed Jan 23 00:46:53 2013 (r245829) +++ projects/bmake/share/mk/bsd.prog.mk Wed Jan 23 00:47:43 2013 (r245830) @@ -241,12 +241,24 @@ stage_files stage_as: .else # normally only libs and includes are staged .if ${MK_STAGING_PROG:Uno} != "no" -STAGE_SETS+= prog STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR} +STAGE_SYMLINKS_DIR.prog= ${STAGE_OBJTOP} + +.if defined(PROGNAME) +STAGE_AS_SETS+= prog +STAGE_AS_${PROG}= ${PROGNAME} +stage_as.prog: ${PROG} .if !empty(PROG) -all: stage_files +all: stage_as +.endif +.else +STAGE_SETS+= prog stage_files.prog: ${PROG} +.if !empty(PROG) +all: stage_files .endif +.endif + .if !empty(SYMLINKS) all: stage_symlinks STAGE_SYMLINKS.prog= ${SYMLINKS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301230047.r0N0liDO081816>