diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-07 08:42:47 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-07 08:42:47 +0200 |
| commit | 120031b8d5f75fd631b96396d2e69fe920455098 (patch) | |
| tree | a823ea827f615b02908f223b226774858ed38591 /lib/am/libs.am | |
| parent | 196abe9a7bcfe78d06b6fa88fe5100d607d3aef1 (diff) | |
| download | automake-120031b8d5f75fd631b96396d2e69fe920455098.tar.gz | |
Fail upon install or ranlib failure, part two.
* lib/am/java.am (install-%DIR%JAVA): Fail upon install failure.
* lib/am/lisp.am (install-%DIR%LISP): Likewise.
* lib/am/ltlib.am (install-%DIR%LTLIBRARIES): Likewise.
* lib/am/libs.am (install-%DIR%LIBRARIES): Likewise, for
`install' as well as `ranlib'.
* lib/am/progs.am (install-%DIR%PROGRAMS): If `install' fails,
return its exit failure, not 1.
* tests/instfail.test: New test, for PROGRAMS (without libtool),
LIBRARIES, including nobase variants.
* tests/instfail-info.test: Likewise, for TEXINFOS.
* tests/instfail-java.test: Likewise, for JAVA.
* tests/instfail-libtool.test: Likewise, for PROGRAMS (with
libtool) and LTLIBRARIES.
* tests/Makefile.am: Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'lib/am/libs.am')
| -rw-r--r-- | lib/am/libs.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/am/libs.am b/lib/am/libs.am index 18d96421a..6cd0988d8 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -40,7 +40,7 @@ if %?BASE% done; \ test -z "$$list2" || { \ echo " $(%DIR%LIBRARIES_INSTALL) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \ - $(%DIR%LIBRARIES_INSTALL) $$list2 "$(DESTDIR)$(%NDIR%dir)"; } + $(%DIR%LIBRARIES_INSTALL) $$list2 "$(DESTDIR)$(%NDIR%dir)" || exit $$?; } else !%?BASE% ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @@ -53,7 +53,7 @@ else !%?BASE% echo "$(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \ $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \ echo " $(%DIR%%PRIMARY%_INSTALL) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \ - $(%DIR%%PRIMARY%_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \ + $(%DIR%%PRIMARY%_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \ done endif !%?BASE% ## We do two loops here so that $(POST_INSTALL) can be empty. If we @@ -67,7 +67,7 @@ endif !%?BASE% %BASE?$(am__strip_dir):f=$$p;% \ ## Must ranlib after installing because mod time changes. echo " $(RANLIB) '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ - $(RANLIB) "$(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(RANLIB) "$(DESTDIR)$(%NDIR%dir)/$$f" || exit $$?; \ else :; fi; \ done endif %?INSTALL% |