mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 07:45:50 +00:00
Code Issues Releases Wiki Activity

Author: Michael (kensington)

Browse Source 
When running installing apparmor-utils from Makefile, some warnings are
generated: make[1]: warning: jobserver unavailable: using -j1. Add
 `+' to parent make rule.

Use $(MAKE) instead of make

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2011-11-10 09:27:29 -08:00
parent e1763ba13c
commit e91cc118df
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/Makefile
View File

@@ -36,7 +36,7 @@ MODULES = ${MODDIR}/AppArmor.pm ${MODDIR}/Repository.pm \
MANPAGES = ${TOOLS:=.8} logprof.conf.5 MANPAGES = ${TOOLS:=.8} logprof.conf.5
all: ${MANPAGES} ${HTMLMANPAGES} all: ${MANPAGES} ${HTMLMANPAGES}
make -C po all $(MAKE) -C po all
# need some better way of determining this # need some better way of determining this
DESTDIR=/ DESTDIR=/
@@ -46,7 +46,7 @@ VENDOR_PERL=$(shell perl -e 'use Config; print $$Config{"vendorlib"};')
PERLDIR=${DESTDIR}${VENDOR_PERL}/${MODDIR} PERLDIR=${DESTDIR}${VENDOR_PERL}/${MODDIR}
po/${NAME}.pot: ${TOOLS} po/${NAME}.pot: ${TOOLS}
make -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS} ${MODULES}" $(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS} ${MODULES}"
.PHONY: install .PHONY: install
install: ${MANPAGES} ${HTMLMANPAGES} install: ${MANPAGES} ${HTMLMANPAGES}
@@ -57,8 +57,8 @@ install: ${MANPAGES} ${HTMLMANPAGES}
install -m 755 ${TOOLS} ${BINDIR} install -m 755 ${TOOLS} ${BINDIR}
install -d ${PERLDIR} install -d ${PERLDIR}
install -m 644 ${MODULES} ${PERLDIR} install -m 644 ${MODULES} ${PERLDIR}
make -C po install DESTDIR=${DESTDIR} NAME=${NAME} $(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
make install_manpages DESTDIR=${DESTDIR} $(MAKE) install_manpages DESTDIR=${DESTDIR}
ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8 ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
.PHONY: clean .PHONY: clean
@@ -66,7 +66,7 @@ install: ${MANPAGES} ${HTMLMANPAGES}
clean: _clean clean: _clean
rm -f core core.* *.o *.s *.a *~ rm -f core core.* *.o *.s *.a *~
rm -f Make.rules rm -f Make.rules
make -C po clean $(MAKE) -C po clean
check: check:
for i in ${MODULES} ${PERLTOOLS} ; do \ for i in ${MODULES} ${PERLTOOLS} ; do \