Allow setting of libdirname.

Modifies the Makefiles so that the installer can specify the name
of the directory that libraries should be installed into by setting
LIBDIRNAME.  For instance 'lib' or 'lib64'.

diff --git a/Makefile b/Makefile
index 11bb472..7354caf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,15 +72,15 @@ clean:
 install: install-bin install-dev
 
 install-dev: all
-       $(MKDIR) -p $(DESTDIR)$(prefix)/lib
+       $(MKDIR) -p $(DESTDIR)$(prefix)/$(LIBDIRNAME)
        $(MKDIR) -p $(DESTDIR)$(prefix)/include
-       $(INSTALL) -m0644 libuci.a $(DESTDIR)$(prefix)/lib/
+       $(INSTALL) -m0644 libuci.a $(DESTDIR)$(prefix)/$(LIBDIRNAME)/
        $(INSTALL) -m0644 uci_config.h uci.h ucimap.h $(DESTDIR)$(prefix)/include/
 
 install-bin: all
-       $(MKDIR) -p $(DESTDIR)$(prefix)/lib
-       $(INSTALL) -m0755 $(SHLIB_FILE) $(DESTDIR)$(prefix)/lib/
-       ln -sf $(SHLIB_FILE) $(DESTDIR)$(prefix)/lib/libuci.$(SHLIB_EXT)
+       $(MKDIR) -p $(DESTDIR)$(prefix)/$(LIBDIRNAME)
+       $(INSTALL) -m0755 $(SHLIB_FILE) $(DESTDIR)$(prefix)/$(LIBDIRNAME)/
+       ln -sf $(SHLIB_FILE) $(DESTDIR)$(prefix)/$(LIBDIRNAME)/libuci.$(SHLIB_EXT)
        $(MKDIR) -p $(DESTDIR)$(prefix)/bin
        $(INSTALL) -m0755 uci $(DESTDIR)$(prefix)/bin/
 

diff --git a/Makefile.inc b/Makefile.inc
index 59edeeb..2cfce43 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,5 +1,6 @@
 prefix=/usr
 DESTDIR=
+LIBDIRNAME=lib
 
 COPTS=-O2
 WOPTS=-pedantic -Werror -Wall