X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=Makefile.inc;h=698caf2270cc9e15b9b4c32bcda1efcfc8100aca;hb=HEAD;hp=44c6aa55b1260fe11d9bcbeeb449b6774c42f931;hpb=213d8d8934f797849eb80b7ac06b6d37f3090e40;p=uci.git

diff --git a/Makefile.inc b/Makefile.inc
index 44c6aa5..698caf2 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,10 +1,19 @@
 prefix=/usr
 DESTDIR=
+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
 FPIC=-fPIC
 CFLAGS=$(COPTS) $(WOPTS) -std=gnu99
+CPPFLAGS=-I.
 
 AR=ar
 LD=ld
@@ -22,6 +31,9 @@ ifeq ($(OS),Darwin)
   LINK=$(LD)
   SHLIB_EXT=dylib
   SHLIB_FLAGS=-dylib
+  ifeq ($(shell gcc -dumpmachine),i686-apple-darwin10)
+    SHLIB_FLAGS += -arch x86_64
+  endif
 else
   LINK=$(CC)
   SHLIB_EXT=so