clockworkpi/WiringPi
1
0
Fork 0
mirror of https://github.com/clockworkpi/WiringPi.git synced 2025-12-13 08:18:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefiles: Honour LDCONFIG from the environment

Browse Source 
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>
This commit is contained in:
Ian Jackson 2015-09-12 17:16:46 +00:00
parent 508d6b31bd
commit f5dd04b5ae
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devLib/Makefile
View File

@ -25,6 +25,8 @@ VERSION=$(shell cat ../VERSION)
DESTDIR?=/usr DESTDIR?=/usr
PREFIX?=/local PREFIX?=/local
LDCONFIG?=ldconfig
ifneq ($V,1) ifneq ($V,1)
Q ?= @ Q ?= @
endif endif
@ -90,7 +92,7 @@ install: $(DYNAMIC)
$Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib
$Q install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $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 ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so
$Q ldconfig $Q $(LDCONFIG)
.PHONY: install-static .PHONY: install-static
install-static: $(STATIC) install-static: $(STATIC)
@ -116,7 +118,7 @@ uninstall:
$Q echo "[UnInstall]" $Q echo "[UnInstall]"
$Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS) $Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
$Q cd $(DESTDIR)$(PREFIX)/lib/ && rm -f libwiringPiDev.* $Q cd $(DESTDIR)$(PREFIX)/lib/ && rm -f libwiringPiDev.*
$Q ldconfig $Q $(LDCONFIG)
.PHONY: depend .PHONY: depend

6
wiringPi/Makefile
View File

@ -25,6 +25,8 @@ VERSION=$(shell cat ../VERSION)
DESTDIR?=/usr DESTDIR?=/usr
PREFIX?=/local PREFIX?=/local
LDCONFIG?=ldconfig
ifneq ($V,1) ifneq ($V,1)
Q ?= @ Q ?= @
endif endif
@ -114,7 +116,7 @@ install: $(DYNAMIC)
$Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib
$Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) $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 ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so
$Q ldconfig $Q $(LDCONFIG)
.PHONY: install-static .PHONY: install-static
install-static: $(STATIC) install-static: $(STATIC)
@ -140,7 +142,7 @@ uninstall:
$Q echo "[UnInstall]" $Q echo "[UnInstall]"
$Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS) $Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
$Q cd $(DESTDIR)$(PREFIX)/lib/ && rm -f libwiringPi.* $Q cd $(DESTDIR)$(PREFIX)/lib/ && rm -f libwiringPi.*
$Q ldconfig $Q $(LDCONFIG)
.PHONY: depend .PHONY: depend