[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

Tue, 10 Jul 2012 11:32:41 -0700 

Signed-off-by: Jeffrey Blank <[email protected]>
---
 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)
 
-- 
1.7.1

_______________________________________________
scap-security-guide mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/scap-security-guide

Reply via email to