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=0dc699477e79bb7a9cc1147439dbc04f3d006520'>refs</a><a class='active' href='/guix/log/gnu/installer/newt/keymap.scm'>log</a><a href='/guix/tree/gnu/installer/newt/keymap.scm?id=0dc699477e79bb7a9cc1147439dbc04f3d006520'>tree</a><a href='/guix/commit/gnu/installer/newt/keymap.scm?id=0dc699477e79bb7a9cc1147439dbc04f3d006520'>commit</a><a href='/guix/diff/gnu/installer/newt/keymap.scm?id=0dc699477e79bb7a9cc1147439dbc04f3d006520'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/newt/keymap.scm'>
<input type='hidden' name='id' value='0dc699477e79bb7a9cc1147439dbc04f3d006520'/><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=0dc699477e79bb7a9cc1147439dbc04f3d006520'>root</a>/<a href='/guix/log/gnu?id=0dc699477e79bb7a9cc1147439dbc04f3d006520'>gnu</a>/<a href='/guix/log/gnu/installer?id=0dc699477e79bb7a9cc1147439dbc04f3d006520'>installer</a>/<a href='/guix/log/gnu/installer/newt?id=0dc699477e79bb7a9cc1147439dbc04f3d006520'>newt</a>/<a href='/guix/log/gnu/installer/newt/keymap.scm?id=0dc699477e79bb7a9cc1147439dbc04f3d006520'>keymap.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/installer/newt/keymap.scm?id=0dc699477e79bb7a9cc1147439dbc04f3d006520&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-02-02 16:46:44 +0100'>2022-02-02</span></td><td><a href='/guix/commit/gnu/installer/newt/keymap.scm?id=726d0bd2f36363392ba2fcefd6e5d4aeed27dc9e'>installer: Use named prompt to abort or break installer steps.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/steps.scm (run-installer-steps): Set up
'installer-step prompt.
* gnu/installer/newt/ethernet.scm (run-ethernet-page)
* gnu/installer/newt/final.scm (run-config-display-page,
run-install-failed-page)
* gnu/installer/newt/keymap.scm (run-layout-page, run-variant-page)
* gnu/installer/newt/locale.scm (run-language-page,
run-territory-page, run-codeset-page, run-modifier-page,
run-locale-page)
* gnu/installer/newt/network.scm (run-technology-page,
wait-service-online)
* gnu/installer/newt/page.scm (run-listbox-selection-page,
run-checkbox-tree-page)
* gnu/installer/newt/partition.scm (button-exit-action)
* gnu/installer/newt/services.scm (run-desktop-environments-cbt-page,
run-networking-cbt-page, run-other-services-cbt-page,
run-network-management-page)
* gnu/installer/newt/timezone.scm (run-timezone-page)
* gnu/installer/newt/user.scm (run-user-page)
* gnu/installer/newt/welcome.scm (run-menu-page)
* gnu/installer/newt/wifi.scm (run-wifi-page): Use the 'installer-step
prompt to abort.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>