From 1439d006cd52a3dbc87f2d22d6926427bf5ee1c9 Mon Sep 17 00:00:00 2001
From: Steve Beattie <sbeattie@ubuntu.com>
Date: Thu, 22 Mar 2012 13:27:29 -0700
Subject: [PATCH] Subject: add apparmor.vim install target to utils/ install

This patch adds a make install target for the generated apparmor.vim
file, installing by default into /usr/share/apparmor based on IRC
discussions; alternate suggestions welcome. (Installing directly
into the vim syntax tree is difficult as the system path by default
contains the vim version number.)
---
 utils/Makefile     | 1 +
 utils/vim/Makefile | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/utils/Makefile b/utils/Makefile
index d48fd7296..8a0e91eb1 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -60,6 +60,7 @@ install: ${MANPAGES} ${HTMLMANPAGES}
 	install -m 644 ${MODULES} ${PERLDIR}
 	$(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
 
 .PHONY: clean
diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index 4eb1947de..294e093bf 100644
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -9,10 +9,17 @@ common/Make.rules: $(COMMONDIR)/Make.rules
 	ln -sf $(COMMONDIR) .
 endif
 
+VIM_INSTALL_PATH=${DESTDIR}/usr/share/apparmor
+
 all: apparmor.vim
 
 apparmor.vim: apparmor.vim.in Makefile create-apparmor.vim.py
 	python create-apparmor.vim.py > $@
 
+install: apparmor.vim
+	install -d $(VIM_INSTALL_PATH)
+	install -m 644 $< $(VIM_INSTALL_PATH)
+
+
 clean:
 	rm -f apparmor.vim