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

diff --git a/src/Makefile b/src/Makefile
index 028af4df5b864b274e7e9b6da369499d70af7d3e..bd1c160cd514b0b8b59154d2974d78a83b1606b2 100644 (file)
--- a/src/Makefile
+++ b/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

diff --git a/src/common/Makefile b/src/common/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/common/Makefile
+++ b/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.

diff --git a/src/crypto/Makefile b/src/crypto/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/crypto/Makefile
+++ b/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.

diff --git a/src/drivers/Makefile b/src/drivers/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/drivers/Makefile
+++ b/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.

diff --git a/src/eap_common/Makefile b/src/eap_common/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/eap_common/Makefile
+++ b/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.

diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
index 2fcda6a645241b68f40b170a6fbe208ad50e1482..d9449a28da42d5bd40c90cbdf0ebb4b6b88249f2 100644 (file)
--- a/src/eap_peer/Makefile
+++ b/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

diff --git a/src/eap_server/Makefile b/src/eap_server/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/eap_server/Makefile
+++ b/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.

diff --git a/src/eapol_supp/Makefile b/src/eapol_supp/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/eapol_supp/Makefile
+++ b/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.

diff --git a/src/hlr_auc_gw/Makefile b/src/hlr_auc_gw/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/hlr_auc_gw/Makefile
+++ b/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.

diff --git a/src/l2_packet/Makefile b/src/l2_packet/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/l2_packet/Makefile
+++ b/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.

diff --git a/src/radius/Makefile b/src/radius/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/radius/Makefile
+++ b/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.

diff --git a/src/rsn_supp/Makefile b/src/rsn_supp/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/rsn_supp/Makefile
+++ b/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.

diff --git a/src/tls/Makefile b/src/tls/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/tls/Makefile
+++ b/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.

diff --git a/src/utils/Makefile b/src/utils/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/utils/Makefile
+++ b/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.

diff --git a/src/wps/Makefile b/src/wps/Makefile
index 37d649c522d5171162c4f63f803262c179e61154..cffba620da04f45c449cf31dfded3b58cc03ab38 100644 (file)
--- a/src/wps/Makefile
+++ b/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.

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index d4ad42473b63e5f5a407a83c298e327245c752bc..47d8489bf581b92f4ccf76c95eb892b51eb4fd6a 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/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