Makefiles: Honour LDCONFIG from the environment

This is not set in normal shell sessions.

Honouring an existing setting of LDCONFIG allows the caller of ./build
to specify an alternative program to run.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/devLib/Makefile b/devLib/Makefile
index 9ec163dbd04c8fc0a070b3c38ba0421183708901..38ab9d9cd164fd24bae91aeaa95e954cf4fc3509 100644 (file)
--- a/devLib/Makefile
+++ b/devLib/Makefile
@@ -25,6 +25,8 @@ VERSION=$(shell cat ../VERSION)
 DESTDIR?=/usr
 PREFIX?=/local
 
 DESTDIR?=/usr
 PREFIX?=/local
 

+LDCONFIG?=ldconfig
+

 ifneq ($V,1)
 Q ?= @
 endif
 ifneq ($V,1)
 Q ?= @
 endif


@@ -90,7 +92,7 @@ install:      $(DYNAMIC)
        $Q install -m 0755 -d                                           $(DESTDIR)$(PREFIX)/lib
        $Q install -m 0755 libwiringPiDev.so.$(VERSION)                 $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
        $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)  $(DESTDIR)/lib/libwiringPiDev.so
        $Q install -m 0755 -d                                           $(DESTDIR)$(PREFIX)/lib
        $Q install -m 0755 libwiringPiDev.so.$(VERSION)                 $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
        $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)  $(DESTDIR)/lib/libwiringPiDev.so

-       $Q ldconfig
+       $Q $(LDCONFIG)

 
 .PHONY:        install-static
 install-static:        $(STATIC)
 
 .PHONY:        install-static
 install-static:        $(STATIC)


@@ -116,7 +118,7 @@ uninstall:
        $Q echo "[UnInstall]"
        $Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
        $Q cd $(DESTDIR)$(PREFIX)/lib/     && rm -f libwiringPiDev.*
        $Q echo "[UnInstall]"
        $Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
        $Q cd $(DESTDIR)$(PREFIX)/lib/     && rm -f libwiringPiDev.*

-       $Q ldconfig
+       $Q $(LDCONFIG)

 
 
 .PHONY:        depend
 
 
 .PHONY:        depend

diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index c0623ce3f14e833b9e421584d5e210843864552d..5518c9e50ab687fb029b31113b1595e8de7de2b0 100644 (file)
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -25,6 +25,8 @@ VERSION=$(shell cat ../VERSION)
 DESTDIR?=/usr
 PREFIX?=/local
 
 DESTDIR?=/usr
 PREFIX?=/local
 

+LDCONFIG?=ldconfig
+

 ifneq ($V,1)
 Q ?= @
 endif
 ifneq ($V,1)
 Q ?= @
 endif


@@ -114,7 +116,7 @@ install:    $(DYNAMIC)
        $Q install -m 0755 -d                                           $(DESTDIR)$(PREFIX)/lib
        $Q install -m 0755 libwiringPi.so.$(VERSION)                    $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
        $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)     $(DESTDIR)/lib/libwiringPi.so
        $Q install -m 0755 -d                                           $(DESTDIR)$(PREFIX)/lib
        $Q install -m 0755 libwiringPi.so.$(VERSION)                    $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
        $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)     $(DESTDIR)/lib/libwiringPi.so

-       $Q ldconfig
+       $Q $(LDCONFIG)

 
 .PHONY:        install-static
 install-static:        $(STATIC)
 
 .PHONY:        install-static
 install-static:        $(STATIC)


@@ -140,7 +142,7 @@ uninstall:
        $Q echo "[UnInstall]"
        $Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
        $Q cd $(DESTDIR)$(PREFIX)/lib/     && rm -f libwiringPi.*
        $Q echo "[UnInstall]"
        $Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
        $Q cd $(DESTDIR)$(PREFIX)/lib/     && rm -f libwiringPi.*

-       $Q ldconfig
+       $Q $(LDCONFIG)

 
 
 .PHONY:        depend
 
 
 .PHONY:        depend