[asterisk-commits] Revert "build: Execute ldconfig to build cache." (asterisk[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Feb 22 13:56:49 CST 2017


Anonymous Coward #1000019 has submitted this change and it was merged. ( https://gerrit.asterisk.org/5062 )

Change subject: Revert "build: Execute ldconfig to build cache."
......................................................................


Revert "build: Execute ldconfig to build cache."

This reverts commit 28c8e4f58f0f38792c7c79a05bd07788ebf15332.

Change-Id: Ie2e1aaf61fd49045994974a4581545ac8348fe4c
---
M main/Makefile
1 file changed, 0 insertions(+), 8 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/main/Makefile b/main/Makefile
index 3c371c6..4d1b2c4 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -355,11 +355,7 @@
 endif
 endif
 ifneq ($(LDCONFIG),)
-ifneq ($(DESTDIR),)
 	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
-else
-	$(LDCONFIG)
-endif
 endif
 	$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
 
@@ -377,11 +373,7 @@
 	rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)"
 endif
 ifneq ($(LDCONFIG),)
-ifneq ($(DESTDIR),)
 	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
-else
-	$(LDCONFIG)
-endif
 endif
 
 clean::

-- 
To view, visit https://gerrit.asterisk.org/5062
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2e1aaf61fd49045994974a4581545ac8348fe4c
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>



More information about the asterisk-commits mailing list