RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-02-26 14:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

mcstrans: take LIBDIR from args, dont guess

Browse Source 
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@perfinion.com>
This commit is contained in:
Jason Zaman 2016-11-16 22:05:19 +08:00 committed by Stephen Smalley
parent 30cbe52c5b
commit 089000ad1c
2 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mcstrans/src/Makefile
View File

@ -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. # Installation directories.
PREFIX ?= $(DESTDIR)/usr PREFIX ?= $(DESTDIR)/usr
LIBDIR ?= $(PREFIX)/lib
SBINDIR ?= $(DESTDIR)/sbin SBINDIR ?= $(DESTDIR)/sbin
INITDIR ?= $(DESTDIR)/etc/rc.d/init.d INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd

18
mcstrans/utils/Makefile
View File

@ -1,24 +1,8 @@
# Installation directories. # Installation directories.
PREFIX ?= $(DESTDIR)/usr PREFIX ?= $(DESTDIR)/usr
LIBDIR ?= $(PREFIX)/lib
BINDIR ?= $(PREFIX)/sbin 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 CFLAGS ?= -Wall
override CFLAGS += -I../src -D_GNU_SOURCE override CFLAGS += -I../src -D_GNU_SOURCE
LDLIBS += -L../src ../src/mcstrans.o ../src/mls_level.o -lselinux -lpcre $(LIBDIR)/libsepol.a LDLIBS += -L../src ../src/mcstrans.o ../src/mls_level.o -lselinux -lpcre $(LIBDIR)/libsepol.a