Return-Path: Delivered-To: new-httpd-archive@hyperreal.org Received: (qmail 3265 invoked by uid 6000); 15 Aug 1999 06:14:55 -0000 Received: (qmail 3244 invoked from network); 15 Aug 1999 06:14:53 -0000 Received: from unknown (HELO w1.drh.net) (qmailr@209.123.159.11) by taz.hyperreal.org with SMTP; 15 Aug 1999 06:14:53 -0000 Received: (qmail 12545 invoked from network); 15 Aug 1999 06:14:57 -0000 Received: from cc932277-a.hwrd1.md.home.com (HELO delf) (@24.3.22.201) by 209.123.159.11 with SMTP; 15 Aug 1999 06:14:57 -0000 From: "David Harris" To: Subject: RE: [patch] make does not propagate src/support errors Date: Sun, 15 Aug 1999 02:07:36 -0400 Message-ID: <001601bee6e4$788274a0$0500a8c0@delf> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0017_01BEE6C2.F170D4A0" X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook 8.5, Build 4.71.2173.0 X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2314.1300 In-reply-to: <001101bee6e1$35638fe0$0500a8c0@delf> Importance: Normal Sender: new-httpd-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org This is a multi-part message in MIME format. ------=_NextPart_000_0017_01BEE6C2.F170D4A0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Arrroughh.. last patches were also messed up. I feel like such a fool. Okay, this one I've tested more than just "oh, the build stops at the right point.. that's good". Lessons learned: (1) Test even simple things really, really thoroughly. (2) Don't rush fixes out the door so fast that you forget to do thorough testing. - David Harris Principal Engineer, DRH Internet Services ------=_NextPart_000_0017_01BEE6C2.F170D4A0 Content-Type: application/octet-stream; name="apache_1.3.6_makefile_error1.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="apache_1.3.6_makefile_error1.patch" --- apache_1.3.6/Makefile.tmpl.orig Sun Aug 15 01:25:16 1999=0A= +++ apache_1.3.6/Makefile.tmpl Sun Aug 15 01:42:26 1999=0A= @@ -172,32 +172,34 @@=0A= @$(MAKE) -f $(TOP)/$(MKF) $(MFLAGS) $(MFWD) QUIET=3D1 build=0A= =0A= # build the standard stuff=0A= build-std:=0A= @cd $(TOP)/$(SRC); $(MAKE) $(MFLAGS) SDP=3D$(SRC)/ all=0A= =0A= # build the additional support stuff=0A= build-support:=0A= @echo "=3D=3D=3D> $(SRC)/support"; \=0A= cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) all; \=0A= + if [ ".$${?}" !=3D .0 ]; then exit 1; fi; \=0A= if [ ".$(suexec)" =3D .1 ]; then \=0A= $(MAKE) $(MFLAGS) \=0A= EXTRA_CFLAGS=3D'\=0A= -DHTTPD_USER=3D\"$(suexec_caller)\" \=0A= -DUID_MIN=3D$(suexec_uidmin) \=0A= -DGID_MIN=3D$(suexec_gidmin) \=0A= -DUSERDIR_SUFFIX=3D\"$(suexec_userdir)\" \=0A= -DLOG_EXEC=3D\"$(suexec_logexec)\" \=0A= -DDOC_ROOT=3D\"$(suexec_docroot)\" \=0A= -DSAFE_PATH=3D\"$(suexec_safepath)\" \=0A= ' \=0A= suexec; \=0A= + if [ ".$${?}" !=3D .0 ]; then exit 1; fi; \=0A= fi; \=0A= echo "<=3D=3D=3D $(SRC)/support"=0A= =0A= ## ------------------------------------------------------------------=0A= ## Installation Targets=0A= ## ------------------------------------------------------------------=0A= =0A= # the install target for installing the complete Apache=0A= # package. This is implemented by running subtargets for the=0A= # separate parts of the installation process.=0A= ------=_NextPart_000_0017_01BEE6C2.F170D4A0 Content-Type: application/octet-stream; name="apache_1.3.6_makefile_error2.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="apache_1.3.6_makefile_error2.patch" --- apache_1.3.6/Makefile.tmpl.orig Sun Aug 15 01:25:16 1999=0A= +++ apache_1.3.6/Makefile.tmpl Sun Aug 15 01:39:07 1999=0A= @@ -204,6 +204,7 @@=0A= install:=0A= @if [ ! -f $(TOP)/$(SRC)/.apaci.build.ok ]; then \=0A= $(MAKE) -f $(TOP)/$(MKF) $(MFLAGS) $(MFWD) build; \=0A= + if [ ".$${?}" !=3D .0 ]; then exit 1; fi; \=0A= else \=0A= :; \=0A= fi=0A= @@ -489,6 +490,7 @@=0A= clean-support:=0A= @echo "=3D=3D=3D> $(SRC)/support"; \=0A= cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) clean; \=0A= + if [ ".$${?}" !=3D .0 ]; then exit 1; fi; \=0A= if [ ".$(suexec)" =3D .1 ]; then \=0A= echo "$(RM) suexec"; \=0A= $(RM) suexec; \=0A= @@ -501,8 +503,10 @@=0A= distclean:=0A= @if [ ".$(SRC)" =3D .src ]; then \=0A= $(MAKE) -f $(TOP)/$(MKF) $(MFLAGS) $(MFWD) distclean-normal; \=0A= + if [ ".$${?}" !=3D .0 ]; then exit 1; fi; \=0A= else \=0A= $(MAKE) -f $(TOP)/$(MKF) $(MFLAGS) $(MFWD) distclean-shadow; \=0A= + if [ ".$${?}" !=3D .0 ]; then exit 1; fi; \=0A= fi=0A= =0A= distclean-normal:=0A= @@ -522,6 +526,7 @@=0A= distclean-support:=0A= @echo "=3D=3D=3D> $(SRC)/support"; \=0A= cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) distclean; \=0A= + if [ ".$${?}" !=3D .0 ]; then exit 1; fi; \=0A= if [ ".$(suexec)" =3D .1 ]; then \=0A= echo "$(RM) suexec"; \=0A= $(RM) suexec; \=0A= ------=_NextPart_000_0017_01BEE6C2.F170D4A0--