From 629200f48e18dc1a3a5229739748bad0e2a6a0a2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@suse.cz>
Date: Wed, 4 Feb 2015 11:37:16 +0100
Subject: [PATCH] Do not silently and prematurely end install when ldconfig is
 missing

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 343ecb5..4667146 100644
--- a/Makefile
+++ b/Makefile
@@ -112,9 +112,10 @@ install: $(INSTALL_DEP)
 	$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
 	cd src && test -f $(FILE_SO) && \
 	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
-	  $(LDCONFIG) $(INSTALL_LIB) && \
-	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
-	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+	  ( $(LDCONFIG) $(INSTALL_LIB) ; \
+	    $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+	    $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : \
+	  )
 	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
-- 
2.2.2

guix/refs/?id=563551282857ae166b8ad73f263d7e0af5577ece'>refs</a><a class='active' href='/guix/log/build-aux/hydra/evaluate.scm'>log</a><a href='/guix/tree/build-aux/hydra/evaluate.scm?id=563551282857ae166b8ad73f263d7e0af5577ece'>tree</a><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=563551282857ae166b8ad73f263d7e0af5577ece'>commit</a><a href='/guix/diff/build-aux/hydra/evaluate.scm?id=563551282857ae166b8ad73f263d7e0af5577ece'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/hydra/evaluate.scm'>
<input type='hidden' name='id' value='563551282857ae166b8ad73f263d7e0af5577ece'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=563551282857ae166b8ad73f263d7e0af5577ece'>root</a>/<a href='/guix/log/build-aux?id=563551282857ae166b8ad73f263d7e0af5577ece'>build-aux</a>/<a href='/guix/log/build-aux/hydra?id=563551282857ae166b8ad73f263d7e0af5577ece'>hydra</a>/<a href='/guix/log/build-aux/hydra/evaluate.scm?id=563551282857ae166b8ad73f263d7e0af5577ece'>evaluate.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/build-aux/hydra/evaluate.scm?id=563551282857ae166b8ad73f263d7e0af5577ece&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-01-06 21:41:07 +0100'>2019-01-06</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=65ff85dcee76179f064aa533c6ca8de77a4ebe9a'>hydra: evaluate: Add the checkout to the store.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/evaluate.scm &lt;top level&gt;: Add call to 'add-to-store'.
Use that as the 'file-name' attribute.  Call 'primitive-load' in a
directory excursion to SOURCE.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-04-08 17:48:33 +0200'>2018-04-08</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=9fe95946118e9530504699360b1ca3507fa0360d'>hydra: 'guix-modular' jobs use the new 'build-self'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/guix-modular.scm: Remove 'eval-when' form that fiddled
with '%load-path'.
(build-job): Load 'build-aux/build-self.scm' and call the procedure it
returns.
* build-aux/hydra/evaluate.scm: The 'build-things' replacement no longer
calls 'exit'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-11-21 23:09:16 +0100'>2017-11-21</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=49961951c53df7728e77f69f7bbae88759ce51fb'>hydra: 'evaluate' passes an alist to the entry point.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/evaluate.scm (%top-srcdir): New variable.
&lt;top level&gt;: Pass it to 'hydra-jobs'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-09-28 17:39:54 +0200'>2017-09-28</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=454caca8e6db34d7777ddb4ba84680d41e381b32'>cuirass: Add 'cuirass-jobs.scm' target to compute the Cuirass jobs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/evaluate.scm: Support "cuirass" command line option.
* Makefile.am (cuirass-jobs.scm): New target.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2017-05-07 00:18:36 +0200'>2017-05-07</span></td><td><a href='/guix/commit/build-aux/hydra/evaluate.scm?id=7f4da8ff6b382dce49954f272afc219b1ad4db20'>maint: Add 'time-monotonic' bug workaround in build-aux/hydra/evaluate.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/hydra/evaluate.scm: Add 'time-monotonic' workaround for
Guile 2.2.
</span></span></td><td>Ludovic Courtès</td></tr>