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

efs/?id=23b40c6625e079dadc4df13d65d61f047f216fcf'>refs</a><a class='active' href='/guix/log/gnu/packages/rdesktop.scm'>log</a><a href='/guix/tree/gnu/packages/rdesktop.scm?id=23b40c6625e079dadc4df13d65d61f047f216fcf'>tree</a><a href='/guix/commit/gnu/packages/rdesktop.scm?id=23b40c6625e079dadc4df13d65d61f047f216fcf'>commit</a><a href='/guix/diff/gnu/packages/rdesktop.scm?id=23b40c6625e079dadc4df13d65d61f047f216fcf'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/rdesktop.scm'>
<input type='hidden' name='id' value='23b40c6625e079dadc4df13d65d61f047f216fcf'/><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=23b40c6625e079dadc4df13d65d61f047f216fcf'>root</a>/<a href='/guix/log/gnu?id=23b40c6625e079dadc4df13d65d61f047f216fcf'>gnu</a>/<a href='/guix/log/gnu/packages?id=23b40c6625e079dadc4df13d65d61f047f216fcf'>packages</a>/<a href='/guix/log/gnu/packages/rdesktop.scm?id=23b40c6625e079dadc4df13d65d61f047f216fcf'>rdesktop.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/rdesktop.scm?id=23b40c6625e079dadc4df13d65d61f047f216fcf&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-07-21 18:09:40 -0400'>2016-07-21</span></td><td><a href='/guix/commit/gnu/packages/rdesktop.scm?id=de67e922885baf68a746a0484ca0b45e45b0964b'>gnu: Update URLs for sourceforge.net.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2015-07-18 13:05:01 +0300'>2015-07-18</span></td><td><a href='/guix/commit/gnu/packages/rdesktop.scm?id=e881752c39d455a249731a4e81e64d86f50afc34'>gnu packages: Clean up synopses and descriptions.</a><span class='msg-avail'>...</span></td><td>Alex Kost</td></tr>
<tr><td><span title='2015-07-05 18:27:24 +0200'>2015-07-05</span></td><td><a href='/guix/commit/gnu/packages/rdesktop.scm?id=cc2b77dfc715c2133bd0c9e318bd7dc90bfedece'>gnu: Move content of openssl module into tls module.</a><span class='msg-avail'>...</span></td><td>Andreas Enge</td></tr>
<tr><td><span title='2015-03-03 18:45:10 +0100'>2015-03-03</span></td><td><a href='/guix/commit/gnu/packages/rdesktop.scm?id=00e650981c07abf257e1a319647b1cfe3da8eeb6'>gnu: Add rdesktop.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
/span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=8af77fe96b43333f05b07f02bfad41b7e7c16aa3'>gnu: pciutils: Use HTTPS home page.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-07-10 10:45:30 +0200'>2017-07-10</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=a48da398b3ee279c54db7ea70b3c3195acf5c94b'>gnu: pciutils: Tweak description.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-07-10 10:37:48 +0200'>2017-07-10</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=841e06af71d264b5fbec56f96aec8aa933fbeab2'>gnu: pciutils: Move 'pci.ids.gz' to 'share/hwdata'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-07-10 10:31:19 +0200'>2017-07-10</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=539a68f938d734cc48c365a2f91521f4c4a4c1f0'>gnu: pciutils: Update to 3.5.5.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-02-27 00:03:37 +0100'>2017-02-27</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=3ba43a2297eae9401364568522cb847bea376f3f'>gnu: pciutils: Update to 3.5.4.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2016-11-30 17:35:21 +0100'>2016-11-30</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=873c469e743c9d411614216713dc1679db3f2ed4'>gnu: pciutils: Update to 3.5.2.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>