HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| dcaf2511 TČ |
1 | From 629200f48e18dc1a3a5229739748bad0e2a6a0a2 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@suse.cz> | |
| 3 | Date: Wed, 4 Feb 2015 11:37:16 +0100 | |
| 4 | Subject: [PATCH] Do not silently and prematurely end install when ldconfig is | |
| 5 | missing | |
| 6 | ||
| 7 | --- | |
| 8 | Makefile | 7 ++++--- | |
| 9 | 1 file changed, 4 insertions(+), 3 deletions(-) | |
| 10 | ||
| 11 | diff --git a/Makefile b/Makefile | |
| 12 | index 343ecb5..4667146 100644 | |
| 13 | --- a/Makefile | |
| 14 | +++ b/Makefile | |
| 15 | @@ -112,9 +112,10 @@ install: $(INSTALL_DEP) | |
| 16 | $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) | |
| 17 | cd src && test -f $(FILE_SO) && \ | |
| 18 | $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ | |
| 19 | - $(LDCONFIG) $(INSTALL_LIB) && \ | |
| 20 | - $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ | |
| 21 | - $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : | |
| 22 | + ( $(LDCONFIG) $(INSTALL_LIB) ; \ | |
| 23 | + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ | |
| 24 | + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : \ | |
| 25 | + ) | |
| 26 | cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) | |
| 27 | cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ | |
| 28 | $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ | |
| 29 | -- | |
| 30 | 2.2.2 | |
| 31 |