diff --git a/build b/build index de36f92..f1049de 100755 --- a/build +++ b/build @@ -125,7 +125,7 @@ fi echo echo "WiringPi Library" cd wiringPi - $sudo make uninstall +# $sudo make uninstall if [ x$1 = "xstatic" ]; then make -j5 static check_make_ok diff --git a/debian/libwiringpi2.shlibs b/debian/libwiringpi2.shlibs deleted file mode 100644 index 0be8db1..0000000 --- a/debian/libwiringpi2.shlibs +++ /dev/null @@ -1,2 +0,0 @@ -libwiringPi 2 libwiringpi2 -libwiringPiDev 2 libwiringpi2 diff --git a/debian/rules b/debian/rules index 423a473..5989ac0 100755 --- a/debian/rules +++ b/debian/rules @@ -36,14 +36,5 @@ override_dh_auto_build: dirs PREFIX= WIRINGPI_SUDO= \ bash -xe ./build -override_dh_auto_install: - dh_install - set -ex; for l in libwiringPi libwiringPiDev; do \ - ln -sf $$l.so.$${VERSION} \ - debian/libwiringpi$$soname/usr/lib/$$l.so.$$soname; \ - ln -sf $$l.so.$${VERSION} \ - debian/libwiringpi-dev/usr/lib/$$l.so; \ - done - %: dh $@ diff --git a/devLib/Makefile b/devLib/Makefile index eafd9a5..f1c3e63 100644 --- a/devLib/Makefile +++ b/devLib/Makefile @@ -25,6 +25,8 @@ VERSION=$(shell cat ../VERSION) DESTDIR?=/usr PREFIX?=/local +MAJOR=$(shell cat ../VERSION | cut -d'.' -f1) + LDCONFIG?=ldconfig ifneq ($V,1) @@ -93,7 +95,8 @@ install: $(DYNAMIC) $Q echo "[Install Dynamic Lib]" $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 ln -sf libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so.$(MAJOR) + $Q ln -sf libwiringPiDev.so.$(MAJOR) $(DESTDIR)/lib/libwiringPiDev.so $Q $(LDCONFIG) .PHONY: install-static diff --git a/wiringPi/Makefile b/wiringPi/Makefile index dcae986..91dec11 100755 --- a/wiringPi/Makefile +++ b/wiringPi/Makefile @@ -25,6 +25,8 @@ VERSION=$(shell cat ../VERSION) DESTDIR?=/usr PREFIX?=/local +MAJOR=$(shell cat ../VERSION | cut -d'.' -f1) + LDCONFIG?=ldconfig ifneq ($V,1) @@ -110,7 +112,8 @@ install: $(DYNAMIC) $Q echo "[Install Dynamic Lib]" $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 ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so.$(MAJOR) + $Q ln -sf libwiringPi.so.$(MAJOR) $(DESTDIR)/lib/libwiringPi.so $Q $(LDCONFIG) .PHONY: install-static