From: Mika Laitio <mika.laitio@nokia.com>
Date: Tue, 15 Jan 2013 00:04:28 +0000 (+0200)
Subject: x86/x86_64 install fixes
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4db3fe6421d04e8129a91b8f80c3a7ec522afe99;p=uci.git

x86/x86_64 install fixes

Signed-off-by: Mika Laitio <mika.laitio@nokia.com>
---

diff --git a/Makefile b/Makefile
index f9fe9dd..109e561 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ install-dev: all
 	$(MKDIR) -p $(DESTDIR)$(prefix)/$(LIBDIRNAME)/pkgconfig
 	$(INSTALL) -m0644 libuci.a $(DESTDIR)$(prefix)/$(LIBDIRNAME)/
 	$(INSTALL) -m0644 uci_config.h uci.h ucimap.h $(DESTDIR)$(prefix)/include/
-	$(INSTALL) -m0644 libuci.pc $(DESTDIR)$(prefix)/$(LIBDIRNAME)/pkgconfig
+	$(INSTALL) -m0644 $(LIBUCIPC) $(DESTDIR)$(prefix)/$(LIBDIRNAME)/pkgconfig/libuci.pc
 
 install-bin: all
 	$(MKDIR) -p $(DESTDIR)$(prefix)/$(LIBDIRNAME)
diff --git a/Makefile.inc b/Makefile.inc
index 2cfce43..698caf2 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,6 +1,13 @@
 prefix=/usr
 DESTDIR=
-LIBDIRNAME=lib
+UNAME_P := $(shell uname -p)
+ifeq ($(UNAME_P),x86_64)
+	LIBDIRNAME=lib64
+	LIBUCIPC=lib64uci.pc
+else
+	LIBDIRNAME=lib
+	LIBUCIPC=libuci.pc
+endif
 
 COPTS=-O2
 WOPTS=-pedantic -Werror -Wall
diff --git a/lib64uci.pc b/lib64uci.pc
new file mode 100644
index 0000000..19344d6
--- /dev/null
+++ b/lib64uci.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib64
+includedir=${prefix}/include
+
+Name: libuci
+Description: Unified Configuration Interface
+Version: 0.8
+Libs: -L${libdir} -luci 
+Cflags: -I${includedir}