Improved 'make install' (use BINDIR/LIBDIR, install shared objects)

src/Makefile

@@ -6,3 +6,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do [ -d $$d ] && $(MAKE) -C $$d clean; done
 	rm -f *~
+
+install:
+	for d in $(SUBDIRS); do [ -d $$d ] && $(MAKE) -C $$d install; done

src/common/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/crypto/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/drivers/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/eap_common/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/eap_peer/Makefile

@@ -4,3 +4,9 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.so *.d
+
+install:
+	if ls *.so >/dev/null 2>&1; then \
+		install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \
+		cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
+	; fi

src/eap_server/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/eapol_supp/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/hlr_auc_gw/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/l2_packet/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/radius/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/rsn_supp/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/tls/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/utils/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

src/wps/Makefile

@@ -4,3 +4,6 @@ all:
 clean:
 	for d in $(SUBDIRS); do make -C $$d clean; done
 	rm -f *~ *.o *.d
+
+install:
+	@echo Nothing to be made.

wpa_supplicant/Makefile

@@ -6,6 +6,9 @@ ifndef CFLAGS
 CFLAGS = -MMD -O2 -Wall -g
 endif
 
+export LIBDIR ?= /usr/local/lib/
+export BINDIR ?= /usr/local/sbin/
+
 CFLAGS += -I../src
 CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
@@ -35,8 +38,9 @@ mkconfig:
 	echo CONFIG_WIRELESS_EXTENSION=y >> .config
 
 install: all
-	mkdir -p $(DESTDIR)/usr/local/sbin/
-	for i in $(ALL); do cp $$i $(DESTDIR)/usr/local/sbin/$$i; done
+	mkdir -p $(DESTDIR)$(BINDIR)
+	for i in $(ALL); do cp $$i $(DESTDIR)$(BINDIR)/$$i; done
+	$(MAKE) -C ../src install
 
 OBJS = config.o
 OBJS += ../src/utils/common.o