[PATCH] update so that toplevel "Make all" leaves output files in subprojects * imperfectly, this also causes project building twice: once for the subproject, and again during RPM building. But this behavior feels more appropriate than a Make rule which leaves subprojects cleaned

Shawn Wells shawn at redhat.com
Tue Jul 10 18:48:24 UTC 2012


On 7/10/12 2:32 PM, Jeffrey Blank wrote:
> Signed-off-by: Jeffrey Blank <blank at eclipse.ncsc.mil>
> ---
>   Makefile |    7 +++++--
>   1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 78e9490..b2216fc 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -34,12 +34,15 @@ define rpm-prep
>   	 $(call MKDIR,$(RPM_TOPDIR)/SRPMS)
>   endef
>   
> -all: rpm
> +all: rhel6 rpm
> +
> +rhel6:
> +	cd rhel6/src && $(MAKE)
>   
>   tarball:
> -	cd rhel6/src && $(MAKE) clean
>   	$(call rpm-prep)
>   	cp -r rhel6 $(RPM_TMPDIR)/$(PKG)	
> +	cd $(RPM_TMPDIR)/$(PKG)/rhel6/src && $(MAKE) clean
>   	cd $(RPM_TMPDIR) && tar -czf $(PKG).tar.gz $(PKG)
>   	cp $(RPM_TMPDIR)/$(PKG).tar.gz $(TARBALL)
>   

Ack. This keeps the rhel6/src/output/* content now.




More information about the scap-security-guide mailing list