[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7

Mike Christie michaelc at cs.wisc.edu
Sat Apr 7 15:43:55 UTC 2012


The following commit has been merged in the upstream-mnc branch:
commit 953f1d229519e988125b504f3813544de41dab32
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Mon Oct 10 22:02:00 2011 -0500

    Do not run configure for open-isns on every build
    
    We only need to run configure in open-isns if either the
    configure script or Makefile.in has changed. Otherwise
    it's perfectly okay just to call a plain 'make' here.
    
    Signed-off-by: Hannes Reinecke <hare at suse.de>

diff --git a/Makefile b/Makefile
index d62bc82..c5d9700 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ IFACEFILES = etc/iface.example
 
 all: user
 
-user: ;
-	cd utils/open-isns; ./configure --with-security=no; $(MAKE)
+user: utils/open-isns/Makefile
+	$(MAKE) -C utils/open-isns
 	$(MAKE) -C utils/sysdeps
 	$(MAKE) -C utils/fwparam_ibft
 	$(MAKE) -C usr
@@ -41,6 +41,9 @@ user: ;
 	@echo
 	@echo "Read README file for detailed information."
 
+utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in
+	cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no
+
 kernel: force
 	$(MAKE) -C kernel
 	@echo "Kernel Compilation complete          Output file"

-- 
Debian Open-iSCSI Packaging



More information about the Pkg-iscsi-maintainers mailing list