All the other makefiles just have LIBDIR optionally set so it can be overridden. These makefiles were autodetecting incorrectly. uname -i returns "GenuineIntel" so should have been uname -m. Signed-off-by: Jason Zaman <jason@xxxxxxxxxxxxx> --- mcstrans/src/Makefile | 18 ++---------------- mcstrans/utils/Makefile | 18 +----------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile index 907a1f1..ae74a16 100644 --- a/mcstrans/src/Makefile +++ b/mcstrans/src/Makefile @@ -1,20 +1,6 @@ -ARCH = $(shell uname -i) -ifeq "$(ARCH)" "x86_64" - # In case of 64 bit system, use these lines - LIBDIR=/usr/lib64 -else -ifeq "$(ARCH)" "i686" - # In case of 32 bit system, use these lines - LIBDIR=/usr/lib -else -ifeq "$(ARCH)" "i386" - # In case of 32 bit system, use these lines - LIBDIR=/usr/lib -endif -endif -endif # Installation directories. -PREFIX ?= $(DESTDIR)/usr +PREFIX ?= $(DESTDIR)/usr +LIBDIR ?= $(PREFIX)/lib SBINDIR ?= $(DESTDIR)/sbin INITDIR ?= $(DESTDIR)/etc/rc.d/init.d SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd diff --git a/mcstrans/utils/Makefile b/mcstrans/utils/Makefile index 1ffb027..43608db 100644 --- a/mcstrans/utils/Makefile +++ b/mcstrans/utils/Makefile @@ -1,24 +1,8 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr +LIBDIR ?= $(PREFIX)/lib BINDIR ?= $(PREFIX)/sbin -ARCH = $(shell uname -i) -ifeq "$(ARCH)" "x86_64" - # In case of 64 bit system, use these lines - LIBDIR=/usr/lib64 -else -ifeq "$(ARCH)" "i686" - # In case of 32 bit system, use these lines - LIBDIR=/usr/lib -else -ifeq "$(ARCH)" "i386" - # In case of 32 bit system, use these lines - LIBDIR=/usr/lib -endif -endif -endif - - CFLAGS ?= -Wall override CFLAGS += -I../src -D_GNU_SOURCE LDLIBS += -L../src ../src/mcstrans.o ../src/mls_level.o -lselinux -lpcre $(LIBDIR)/libsepol.a -- 2.7.3 _______________________________________________ Selinux mailing list Selinux@xxxxxxxxxxxxx To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx. To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.
