From b53173fca547b62c26c24d46ee03e2c7db0f5a2c Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 24 Sep 2019 18:12:25 +0200
Subject: [PATCH] move VM network (hook) scripts to own directory

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 Makefile                                             |  6 +-----
 vm-network-scripts/Makefile                          | 12 ++++++++++++
 pve-bridge => vm-network-scripts/pve-bridge          |  0
 .../pve-bridge-hotplug                               |  0
 pve-bridgedown => vm-network-scripts/pve-bridgedown  |  0
 5 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 vm-network-scripts/Makefile
 rename pve-bridge => vm-network-scripts/pve-bridge (100%)
 rename pve-bridge-hotplug => vm-network-scripts/pve-bridge-hotplug (100%)
 rename pve-bridgedown => vm-network-scripts/pve-bridgedown (100%)

diff --git a/Makefile b/Makefile
index 0c4aa1b1..4959335b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ PREFIX=/usr
 BINDIR=${PREFIX}/bin
 SBINDIR=${PREFIX}/sbin
 LIBDIR=${PREFIX}/lib/${PACKAGE}
-VARLIBDIR=/var/lib/${PACKAGE}
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
@@ -59,7 +58,6 @@ PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion
 install: ${PKGSOURCES}
 	install -d ${DESTDIR}/${SBINDIR}
 	install -d ${DESTDIR}${LIBDIR}
-	install -d ${DESTDIR}${VARLIBDIR}
 	install -d ${DESTDIR}/${MAN1DIR}
 	install -d ${DESTDIR}/${MAN5DIR}
 	install -d ${DESTDIR}/${MAN8DIR}
@@ -73,11 +71,9 @@ install: ${PKGSOURCES}
 	$(MAKE) -C PVE install
 	$(MAKE) -C qmeventd install
 	$(MAKE) -C qemu-configs install
+	$(MAKE) -C vm-network-scripts install
 	install -m 0755 qm ${DESTDIR}${SBINDIR}
 	install -m 0755 qmrestore ${DESTDIR}${SBINDIR}
-	install -m 0755 pve-bridge ${DESTDIR}${VARLIBDIR}/pve-bridge
-	install -m 0755 pve-bridge-hotplug ${DESTDIR}${VARLIBDIR}/pve-bridge-hotplug
-	install -m 0755 pve-bridgedown ${DESTDIR}${VARLIBDIR}/pve-bridgedown
 	install -D -m 0644 modules-load.conf ${DESTDIR}/etc/modules-load.d/qemu-server.conf
 	install -m 0755 qmextract ${DESTDIR}${LIBDIR}
 	install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR}
diff --git a/vm-network-scripts/Makefile b/vm-network-scripts/Makefile
new file mode 100644
index 00000000..5ba537d0
--- /dev/null
+++ b/vm-network-scripts/Makefile
@@ -0,0 +1,12 @@
+DESTDIR=
+VARLIBDIR=$(DESTDIR)/var/lib/qemu-server
+
+.PHONY: install
+install: pve-bridge pve-bridge-hotplug pve-bridgedown
+	install -d ${VARLIBDIR}
+	install -m 0755 pve-bridge ${VARLIBDIR}/pve-bridge
+	install -m 0755 pve-bridge-hotplug ${VARLIBDIR}/pve-bridge-hotplug
+	install -m 0755 pve-bridgedown ${VARLIBDIR}/pve-bridgedown
+
+.PHONY: clean
+clean:
diff --git a/pve-bridge b/vm-network-scripts/pve-bridge
similarity index 100%
rename from pve-bridge
rename to vm-network-scripts/pve-bridge
diff --git a/pve-bridge-hotplug b/vm-network-scripts/pve-bridge-hotplug
similarity index 100%
rename from pve-bridge-hotplug
rename to vm-network-scripts/pve-bridge-hotplug
diff --git a/pve-bridgedown b/vm-network-scripts/pve-bridgedown
similarity index 100%
rename from pve-bridgedown
rename to vm-network-scripts/pve-bridgedown