[Date Prev][Date Next] [Chronological] [Thread] [Top]

fixes for build procedure (ITS#582)



Full_Name: Christian Lorenz
Version: 2.0-devel
OS: linux-2.2.14
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (194.112.123.201)


The build procedure doesn't stop if a sub-make fails.
Here are the fixes:

pkg/ldap/build/dir.mk,v 1.9
===========================
--- ldap/build/dir.mk.orig      Fri Jun  9 17:50:47 2000
+++ ldap/build/dir.mk   Fri Jun  9 17:43:47 2000
@@ -13,6 +13,9 @@
        @for i in $(SUBDIRS) $(ALLDIRS); do             \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) all );              \
+               if [ $$? != 0 ]; then                                   \
+                       exit 1;                                                 
       \
+               fi ;                                                            
       \
                echo " ";                                                       
       \
        done
 
@@ -21,6 +24,9 @@
        @for i in $(SUBDIRS) $(INSTALLDIRS); do         \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) install );  \
+               if [ $$? != 0 ]; then                                   \
+                       exit 1;                                                 
       \
+               fi ;                                                            
       \
                echo " ";                                                       
       \
        done
 
@@ -29,6 +35,9 @@
        @for i in $(SUBDIRS) $(CLEANDIRS); do           \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) clean );    \
+               if [ $$? != 0 ]; then                                   \
+                       exit 1;                                                 
       \
+               fi ;                                                            
       \
                echo " ";                                                       
       \
        done
 
@@ -37,6 +46,9 @@
        @for i in $(SUBDIRS) $(CLEANDIRS); do           \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) veryclean );        \
+               if [ $$? != 0 ]; then                                   \
+                       exit 1;                                                 
       \
+               fi ;                                                            
       \
                echo " ";                                                       
       \
        done
 
@@ -45,6 +57,9 @@
        @for i in $(SUBDIRS) $(DEPENDDIRS); do          \
                echo "  Entering subdirectory $$i";             \
                ( cd $$i; $(MAKE) $(MFLAGS) depend );   \
+               if [ $$? != 0 ]; then                                   \
+                       exit 1;                                                 
       \
+               fi ;                                                            
       \
                echo " ";                                                       
       \
        done

pkg/ldap/servers/slapd/Makefile.in,v 1.64
=========================================
--- ldap/servers/slapd/Makefile.in.orig Fri Jun  9 16:55:24 2000
+++ ldap/servers/slapd/Makefile.in      Fri Jun  9 17:45:17 2000
@@ -163,6 +163,9 @@
                if [ -d $$i ]; then \
                        echo " "; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) all ); \
+                       if [ $$? != 0 ]; then \
+                               exit 1; \
+                       fi ; \
                fi; \
        done; \
        echo " "
@@ -199,6 +202,9 @@
                if [ -d $$i ]; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
+                       if [ $$? != 0 ]; then \
+                               exit 1; \
+                       fi ; \
                fi; \
        done
        @echo ""
@@ -211,6 +217,9 @@
                if [ -d $$i ]; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
+                       if [ $$? != 0 ]; then \
+                               exit 1; \
+                       fi ; \
                fi; \
        done
        rm -f *.tmp all-cffiles
@@ -220,6 +229,9 @@
                if [ -d $$i ]; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
+                       if [ $$? != 0 ]; then \
+                               exit 1; \
+                       fi ; \
                fi; \
        done
 
@@ -235,6 +247,9 @@
                if [ -d $$i ]; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) install ); \
+                       if [ $$? != 0 ]; then \
+                               exit 1; \
+                       fi ; \
                fi; \
            done; \
        fi