File wiringPi-install.patch of Package wiringpi
diff --git a/devLib/Makefile b/devLib/Makefile index 611e423..a1e8b24 100644 --- a/devLib/Makefile +++ b/devLib/Makefile @@ -24,6 +24,7 @@ VERSION=$(shell cat ../VERSION) DESTDIR?=/usr PREFIX?=/local +LIB?=lib LDCONFIG?=ldconfig @@ -37,7 +38,7 @@ DYNAMIC=libwiringPiDev.so.$(VERSION) #DEBUG = -g -O0 DEBUG = -O2 CC ?= gcc -INCLUDE = -I. +INCLUDE = -I. -I../wiringPi DEFS = -D_GNU_SOURCE CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS) @@ -68,11 +69,12 @@ $(STATIC): $(OBJ) $(DYNAMIC): $(OBJ) $Q echo "[Link (Dynamic)]" - $Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ) + $Q $(CC) -shared -Wl,-soname,libwiringPiDev.so.$(VERSION) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ) .c.o: $Q echo [Compile] $< $Q $(CC) -c $(CFLAGS) $< -o $@ + $Q ln -sf libwiringPiDev.so.$(VERSION) libwiringPiDev.so .PHONY: clean clean: @@ -91,10 +93,12 @@ install: $(DYNAMIC) $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/include $Q install -m 0644 $(HEADERS) $(DESTDIR)$(PREFIX)/include $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 install -m 0755 -d $(DESTDIR)$(PREFIX)/$(LIB) + $Q install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/libwiringPiDev.so.$(VERSION) + $Q ln -sf libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/libwiringPiDev.so +ifeq ($(DESTDIR),) $Q $(LDCONFIG) +endif .PHONY: install-static install-static: $(STATIC) @@ -125,7 +129,7 @@ install-deb: $(DYNAMIC) check-deb-destdir uninstall: $Q echo "[UnInstall]" $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) diff --git a/gpio/Makefile b/gpio/Makefile index 249bb24..932c43d 100644 --- a/gpio/Makefile +++ b/gpio/Makefile @@ -33,10 +33,10 @@ endif #DEBUG = -g -O0 DEBUG = -O2 CC ?= gcc -INCLUDE = -I$(DESTDIR)$(PREFIX)/include +INCLUDE = -I../devLib -I../wiringPi CFLAGS = $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS) -LDFLAGS = -L$(DESTDIR)$(PREFIX)/lib +LDFLAGS = -L../devLib -L../wiringPi LIBS = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt # May not need to alter anything below this line diff --git a/wiringPi/Makefile b/wiringPi/Makefile index 28501ec..e2b11d8 100644 --- a/wiringPi/Makefile +++ b/wiringPi/Makefile @@ -24,6 +24,7 @@ VERSION=$(shell cat ../VERSION) DESTDIR?=/usr PREFIX?=/local +LIB?=lib LDCONFIG?=ldconfig @@ -75,12 +76,12 @@ static: $(DYNAMIC): $(OBJ) $Q echo "[Link (Dynamic)]" - $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(OBJ) $(LIBS) + $Q $(CC) -shared -Wl,-soname,libwiringPi.so.$(VERSION) -o libwiringPi.so.$(VERSION) $(OBJ) $(LIBS) .c.o: $Q echo [Compile] $< $Q $(CC) -c $(CFLAGS) $< -o $@ - + $Q ln -sf libwiringPi.so.$(VERSION) libwiringPi.so .PHONY: clean clean: @@ -99,10 +100,12 @@ install: $(DYNAMIC) $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/include $Q install -m 0644 $(HEADERS) $(DESTDIR)$(PREFIX)/include $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 install -m 0755 -d $(DESTDIR)$(PREFIX)/$(LIB) + $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/libwiringPi.so.$(VERSION) + $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/libwiringPi.so +ifeq ($(DESTDIR),) $Q $(LDCONFIG) +endif .PHONY: check-deb-destdir check-deb-destdir: @@ -124,7 +127,7 @@ install-deb: $(DYNAMIC) check-deb-destdir uninstall: $Q echo "[UnInstall]" $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)
