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

c38717201e7dc5abe9ff9cfc131fa3da343680'>refs</a><a class='active' href='/guix/log/gnu/packages/tor.scm'>log</a><a href='/guix/tree/gnu/packages/tor.scm?id=14c38717201e7dc5abe9ff9cfc131fa3da343680'>tree</a><a href='/guix/commit/gnu/packages/tor.scm?id=14c38717201e7dc5abe9ff9cfc131fa3da343680'>commit</a><a href='/guix/diff/gnu/packages/tor.scm?id=14c38717201e7dc5abe9ff9cfc131fa3da343680'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/tor.scm'>
<input type='hidden' name='id' value='14c38717201e7dc5abe9ff9cfc131fa3da343680'/><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=14c38717201e7dc5abe9ff9cfc131fa3da343680'>root</a>/<a href='/guix/log/gnu?id=14c38717201e7dc5abe9ff9cfc131fa3da343680'>gnu</a>/<a href='/guix/log/gnu/packages?id=14c38717201e7dc5abe9ff9cfc131fa3da343680'>packages</a>/<a href='/guix/log/gnu/packages/tor.scm?id=14c38717201e7dc5abe9ff9cfc131fa3da343680'>tor.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/tor.scm?id=14c38717201e7dc5abe9ff9cfc131fa3da343680&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-08-17 10:27:31 +0300'>2021-08-17</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=f7094f5a4207a706c9ed9024d71a442f14d0a7fd'>gnu: tractor: Update to 3.12.</a><span class='msg-avail'>...</span></td><td>Danial Behzadi</td></tr>
<tr><td><span title='2021-08-16 23:21:18 +0200'>2021-08-16</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=43b7da5cb9a9d80d668a20ae1c44db87fb049a13'>gnu: tor: Update to 0.4.6.7 [fixes CVE-2021-38385].</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-07-21 23:08:14 -0500'>2021-07-21</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=55db762b31531609f43b32680298762487702280'>gnu: onionshare: Update to 2.3.2.</a><span class='msg-avail'>...</span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2021-06-30 20:02:32 +0300'>2021-06-30</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=b7d70aeb0b5fd595bcbb59b61e513f1291f45575'>gnu: tor: Update to 0.4.6.6.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-06-30 09:56:30 +0200'>2021-06-30</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=387b66b643a796df33d4fcb30549559dadcf0e0f'>gnu: Add tractor.</a><span class='msg-avail'>...</span></td><td>Danial Behzadi</td></tr>
<tr><td><span title='2021-06-14 23:21:16 +0200'>2021-06-14</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=e7aac78ee906e799623419ea993e1eefbfec5733'>gnu: tor: Update to 0.4.6.5.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-06-14 22:41:40 +0200'>2021-06-14</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=27a26663f60c7ddb7c1041b77c6e2e2b38e840bf'>gnu: tor: Update to 0.4.5.9 [security fixes].</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-05-10 18:20:15 +0300'>2021-05-10</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=87b4b0e4385149b40ee87ae2d57712679452746b'>gnu: tor: Update to 0.4.5.8.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-03-16 15:26:33 +0200'>2021-03-16</span></td><td><a href='/guix/commit/gnu/packages/tor.scm?id=09b5cdf80dbbc7166deb2318f1aca266fda6ad26'>gnu: tor: Update to 0.4.5.7 [security fixes].</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>