RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-04-11 04:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkpolicy: build: follow standard semantics for DESTDIR and PREFIX

Browse Source 
This patch solves the following issues:
- DESTDIR is needed during compile time to compute library
  and header paths which it should not.
- Installing with both DESTDIR and PREFIX set gives us odd paths
- Make usage of DESTDIR and PREFIX more standard

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
This commit is contained in:
Marcus Folkesson 2018-02-14 10:57:06 +01:00 committed by Nicolas Iooss
parent e15f61e5d2
commit 23bbd2e448
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
checkpolicy/Makefile
View File

@ -1,12 +1,9 @@
# #
# Makefile for building the checkpolicy program # Makefile for building the checkpolicy program
# #
PREFIX ?= $(DESTDIR)/usr PREFIX ?= /usr
BINDIR ?= $(PREFIX)/bin BINDIR ?= $(PREFIX)/bin
MANDIR ?= $(PREFIX)/share/man MANDIR ?= $(PREFIX)/share/man
LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR ?= $(PREFIX)/include
LIBSEPOLA ?= $(LIBDIR)/libsepol.a
TARGETS = checkpolicy checkmodule TARGETS = checkpolicy checkmodule
LEX = flex LEX = flex
@ -14,7 +11,12 @@ YACC = bison -y
CFLAGS ?= -g -Wall -Werror -Wshadow -O2 -pipe -fno-strict-aliasing CFLAGS ?= -g -Wall -Werror -Wshadow -O2 -pipe -fno-strict-aliasing
override CFLAGS += -I. # If no specific libsepol.a is specified, fall back on LDFLAGS search path
# Otherwise, as $(LIBSEPOLA) already appears in the dependencies, there
# is no need to define a value for LDLIBS_LIBSEPOLA
ifeq ($(LIBSEPOLA),)
LDLIBS_LIBSEPOLA := -l:libsepol.a
endif
CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \ CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \
policy_define.o policy_define.o
@ -27,8 +29,10 @@ all: $(TARGETS)
$(MAKE) -C test $(MAKE) -C test
checkpolicy: $(CHECKPOLOBJS) $(LIBSEPOLA) checkpolicy: $(CHECKPOLOBJS) $(LIBSEPOLA)
$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA)
checkmodule: $(CHECKMODOBJS) $(LIBSEPOLA) checkmodule: $(CHECKMODOBJS) $(LIBSEPOLA)
$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA)
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -o $@ -c $<
@ -46,15 +50,15 @@ lex.yy.c: policy_scan.l y.tab.c
$(LEX) policy_scan.l $(LEX) policy_scan.l
install: all install: all
-mkdir -p $(BINDIR) -mkdir -p $(DESTDIR)$(BINDIR)
-mkdir -p $(MANDIR)/man8 -mkdir -p $(DESTDIR)$(MANDIR)/man8
install -m 755 $(TARGETS) $(BINDIR) install -m 755 $(TARGETS) $(DESTDIR)$(BINDIR)
install -m 644 checkpolicy.8 $(MANDIR)/man8 install -m 644 checkpolicy.8 $(DESTDIR)$(MANDIR)/man8
install -m 644 checkmodule.8 $(MANDIR)/man8 install -m 644 checkmodule.8 $(DESTDIR)$(MANDIR)/man8
relabel: install relabel: install
/sbin/restorecon $(BINDIR)/checkpolicy /sbin/restorecon $(DESTDIR)$(BINDIR)/checkpolicy
/sbin/restorecon $(BINDIR)/checkmodule /sbin/restorecon $(DESTDIR)$(BINDIR)/checkmodule
clean: clean:
-rm -f $(TARGETS) $(CHECKPOLOBJS) $(CHECKMODOBJS) y.tab.c y.tab.h lex.yy.c -rm -f $(TARGETS) $(CHECKPOLOBJS) $(CHECKMODOBJS) y.tab.c y.tab.h lex.yy.c

15
checkpolicy/test/Makefile
View File

@ -1,19 +1,22 @@
# #
# Makefile for building the dispol program # Makefile for building the dispol program
# #
PREFIX ?= $(DESTDIR)/usr
BINDIR ?= $(PREFIX)/bin
LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR ?= $(PREFIX)/include
LIBSEPOLA ?= $(LIBDIR)/libsepol.a
CFLAGS ?= -g -Wall -W -Werror -O2 -pipe CFLAGS ?= -g -Wall -W -Werror -O2 -pipe
# If no specific libsepol.a is specified, fall back on LDFLAGS search path
# Otherwise, as $(LIBSEPOLA) already appears in the dependencies, there
# is no need to define a value for LDLIBS_LIBSEPOLA
ifeq ($(LIBSEPOLA),)
LDLIBS_LIBSEPOLA := -l:libsepol.a
endif
all: dispol dismod all: dispol dismod
dispol: dispol.o $(LIBSEPOLA) dispol: dispol.o $(LIBSEPOLA)
$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA)
dismod: dismod.o $(LIBSEPOLA) dismod: dismod.o $(LIBSEPOLA)
$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA)
clean: clean:
-rm -f dispol dismod *.o -rm -f dispol dismod *.o