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

59f984d68f6d1011633df6d612d2bb54229f'>refs</a><a class='active' href='/guix/log/tests/discovery.scm'>log</a><a href='/guix/tree/tests/discovery.scm?id=e2ac59f984d68f6d1011633df6d612d2bb54229f'>tree</a><a href='/guix/commit/tests/discovery.scm?id=e2ac59f984d68f6d1011633df6d612d2bb54229f'>commit</a><a href='/guix/diff/tests/discovery.scm?id=e2ac59f984d68f6d1011633df6d612d2bb54229f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/discovery.scm'>
<input type='hidden' name='id' value='e2ac59f984d68f6d1011633df6d612d2bb54229f'/><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=e2ac59f984d68f6d1011633df6d612d2bb54229f'>root</a>/<a href='/guix/log/tests?id=e2ac59f984d68f6d1011633df6d612d2bb54229f'>tests</a>/<a href='/guix/log/tests/discovery.scm?id=e2ac59f984d68f6d1011633df6d612d2bb54229f'>discovery.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/tests/discovery.scm?id=e2ac59f984d68f6d1011633df6d612d2bb54229f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-07-03 23:51:23 +0200'>2017-07-03</span></td><td><a href='/guix/commit/tests/discovery.scm?id=960c6ce96d746cf19829ad26e092ec5dad2a5c62'>discovery: Recurse into directories pointed to by a symlink.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by Christopher Baines &lt;mail@cbaines.net&gt;
and Alex Kost &lt;alezost@gmail.com&gt;
at &lt;https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00290.html&gt;.

* guix/discovery.scm (scheme-files): When ENTRY is a symlink that
doesn't end in '.scm', call 'stat' and recurse if it points to a
directory.
* tests/discovery.scm ("scheme-modules recurses in symlinks to
directories"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-06-18 00:14:07 +0200'>2017-06-18</span></td><td><a href='/guix/commit/tests/discovery.scm?id=d46c4423f46278bd2f96770ceb0667431414349e'>discovery: 'scheme-files' returns '() for a non-accessible directory.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes a regression introduced in
d27cc3bfaafe6b5b0831e88afb1c46311d382a0b.

Reported by Ricardo Wurmus &lt;rekado@elephly.net&gt;.

* guix/discovery.scm (scheme-files): Catch 'scandir*' system errors.
Return '() and optionally raise a warning upon 'system-error'.
* tests/discovery.scm ("scheme-modules, non-existent directory"): New
test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-03 23:50:15 +0200'>2017-05-03</span></td><td><a href='/guix/commit/tests/discovery.scm?id=cd903ef7871170d3c4eced45418459d293ef48a7'>Add (guix discovery).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/discovery.scm, tests/discovery.scm: New files.
* gnu/packages.scm (scheme-files, file-name-&gt;module-name)
(scheme-modules, all-package-modules): Remove.
(fold-packages): Rewrite in terms of 'fold-module-public-variables'.
* gnu/tests.scm: Use (guix discovery).
* Makefile.am (MODULES): Add guix/discovery.scm.
(SCM_TESTS): Add tests/discovery.scm.
</span></span></td><td>Ludovic Courtès</td></tr>