aboutsummaryrefslogtreecommitdiffstats
path: root/testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch
blob: f3fa0bbc61b190a9b651be71dc63c3e6828101cf (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
From 24aca47716b70c1d0e3b58a1fbd8e312fec70e07 Mon Sep 17 00:00:00 2001
From: allgdante <allan.garret@gmail.com>
Date: Wed, 4 Jul 2018 17:02:34 +0200
Subject: [PATCH 2/7] utils: remove vim from the default build

We will build the vim utils as a separate target
---
 utils/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/utils/Makefile b/utils/Makefile
index 68f8c376..01604796 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -32,7 +32,6 @@ MANPAGES = ${TOOLS:=.8} logprof.conf.5
 
 all: docs
 	$(MAKE) -C po all
-	$(MAKE) -C vim all
 
 .PHONY: docs
 docs: ${MANPAGES} ${HTMLMANPAGES}
@@ -58,7 +57,6 @@ install: ${MANPAGES} ${HTMLMANPAGES}
 	install -m 755 $(filter-out aa-easyprof, ${TOOLS}) ${BINDIR}
 	$(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
-	$(MAKE) -C vim install DESTDIR=${DESTDIR}
 	ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
 	${PYTHON} ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR} --version=${VERSION}
 
@@ -69,7 +67,6 @@ endif
 clean: pod_clean
 	rm -f core core.* *.o *.s *.a *~
 	$(MAKE) -C po clean
-	$(MAKE) -C vim clean
 	$(MAKE) -C test clean
 	rm -rf staging/ build/
 	rm -f apparmor/*.pyc apparmor/rule/*.pyc
@@ -100,4 +97,3 @@ check: check_severity_db check_pod_files
 		$(PYFLAKES) $$i || exit 1; \
 	done
 	$(MAKE) -C test check
-	$(MAKE) -C vim check
-- 
2.20.1