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

c7a021b5232b50c097202f2ef924db50e01efe'>refs</a><a class='active' href='/guix/log/gnu/packages/tbb.scm'>log</a><a href='/guix/tree/gnu/packages/tbb.scm?id=cdc7a021b5232b50c097202f2ef924db50e01efe'>tree</a><a href='/guix/commit/gnu/packages/tbb.scm?id=cdc7a021b5232b50c097202f2ef924db50e01efe'>commit</a><a href='/guix/diff/gnu/packages/tbb.scm?id=cdc7a021b5232b50c097202f2ef924db50e01efe'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/tbb.scm'>
<input type='hidden' name='id' value='cdc7a021b5232b50c097202f2ef924db50e01efe'/><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=cdc7a021b5232b50c097202f2ef924db50e01efe'>root</a>/<a href='/guix/log/gnu?id=cdc7a021b5232b50c097202f2ef924db50e01efe'>gnu</a>/<a href='/guix/log/gnu/packages?id=cdc7a021b5232b50c097202f2ef924db50e01efe'>packages</a>/<a href='/guix/log/gnu/packages/tbb.scm?id=cdc7a021b5232b50c097202f2ef924db50e01efe'>tbb.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/gnu/packages/tbb.scm?id=cdc7a021b5232b50c097202f2ef924db50e01efe&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-10-08 00:03:24 +0200'>2016-10-08</span></td><td><a href='/guix/commit/gnu/packages/tbb.scm?id=e35ce6893c7b45730979fb61a669488de321dec8'>gnu: tbb: Update to 2017_20160916.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2016-09-26 14:30:58 +0200'>2016-09-26</span></td><td><a href='/guix/commit/gnu/packages/tbb.scm?id=1a545a1e7c30db76e562af527673081b490c4a11'>gnu: tbb: Fail on test errors.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2016-09-26 14:30:57 +0200'>2016-09-26</span></td><td><a href='/guix/commit/gnu/packages/tbb.scm?id=7f5ca399bfe43c32f3a61acb2b7440737e7bbcc5'>gnu: tbb: Use modify-phases syntax.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2016-09-12 10:37:39 +0300'>2016-09-12</span></td><td><a href='/guix/commit/gnu/packages/tbb.scm?id=b6337f30cccd55b6f687f0bd80ef5b32a193f1b1'>gnu: tbb: Update to 2017.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2015-04-27 15:12:46 +0200'>2015-04-27</span></td><td><a href='/guix/commit/gnu/packages/tbb.scm?id=02ed8be3acb20eac54086c78829f858184a9fc8c'>gnu: tbb: Set rpath in LDFLAGS.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2015-04-16 10:23:03 +0200'>2015-04-16</span></td><td><a href='/guix/commit/gnu/packages/tbb.scm?id=4f2bde44330b32d5d34170a46553b9b5036cd2d3'>gnu: tbb: Set library rpath.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2015-01-29 11:40:06 +0100'>2015-01-29</span></td><td><a href='/guix/commit/gnu/packages/tbb.scm?id=8c6c91feadf8cc35426f0254e1b898eb3f9e6fbf'>gnu: Add Threading Building Blocks.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>