Merge pull request #5 from superr/master

Added arch detection to makefile for x86 and x86_64
2015-11-11 21:30:34 +01:00 · 2015-11-11 21:30:34 +01:00 · c6be73dba2
parent 0f4c0b95e2 ccf293906a
commit c6be73dba2
4 changed files with 6 additions and 3 deletions
--- a/9
+++ b/9
@ -1,6 +1,9 @@
-PREFIX ?= $(DESTDIR)/usr
-BINDIR ?= $(PREFIX)/bin
-LIBDIR ?= $(PREFIX)/lib/x86_64-linux-gnu
+LBITS := $(shell getconf LONG_BIT)
+ifeq ($(LBITS),64)
+LIBDIR ?= libs/x86_64
+else
+LIBDIR ?= libs/x86
+endif

 CFLAGS ?= -g -Wall -Werror -Wshadow -O2 -pipe -std=gnu11
 LDLIBS=$(LIBDIR)/libsepol.a 
--- a/libs/libsepol-x86_64.a
+++ b/libs/libsepol-x86_64.a
--- a/libs/x86/libsepol.a
+++ b/libs/x86/libsepol.a
--- a/libs/x86_64/libsepol.a
+++ b/libs/x86_64/libsepol.a