diff options
| author | Phil Pennock <pdp@exim.org> | 2011-08-27 16:10:52 -0700 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2011-08-27 16:10:52 -0700 |
| commit | 7f2a2a43f103bf22970a2b87ad8106f1a57b3d57 (patch) | |
| tree | 0ce3d199bbe0e8d486599ee36b2fbba12758c209 /src | |
| parent | 9e949f00f404d3672b1ecd7c1bfd5e8927a3301d (diff) | |
Stop build process more reliably on failure.
Patch from Heiko Schlittermann.
Fixes bug 1087
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | src/OS/Makefile-Base | 30 |
2 files changed, 17 insertions, 16 deletions
diff --git a/src/Makefile b/src/Makefile index 76234e9a5..4c8300ca7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -66,7 +66,8 @@ makefile: build-directory # The installation commands are kept in a separate script, which expects # to be run from inside the build directory. -install:; @cd build-$(buildname); \ +install: all + @cd build-$(buildname); \ build=$(build) $(SHELL) ../scripts/exim_install $(INSTALL_ARG) # Tidy-up targets diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index 9723c60cc..deb0e44f1 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -639,43 +639,43 @@ $(MONBIN): $(HDRS) # The lookups library. buildlookups lookups/lookups.a: config.h version.h - @cd lookups; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + @cd lookups && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" HDRS="../version.h $(PHDRS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \ - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)"; \ - echo " " + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)" + @echo " " # The routers library. buildrouters routers/routers.a: config.h - @cd routers; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + @cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \ - echo " " + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" + @echo " " # The transports library. buildtransports transports/transports.a: config.h - @cd transports; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + @cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \ - echo " " + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" + @echo " " # The library of authorization modules buildauths auths/auths.a: config.h - @cd auths; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + @cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \ - echo " " + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" + @echo " " # The PDKIM library buildpdkim pdkim/pdkim.a: config.h - @cd pdkim; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ + @cd pdkim && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \ - echo " " + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" + @echo " " # The "clean", "install", and "makefile" targets just pass themselves back to # the main Exim makefile. These targets will be obeyed only if "make" is obeyed |