[v2] autofs: install -- Ship scripts/systemd-autofs-restart.sh

Submitted by Cyrill Gorcunov on April 20, 2016, 6:07 a.m.

Details

Message ID 1461132472-13345-1-git-send-email-gorcunov@openvz.org
State Rejected
Series "autofs: install -- Ship scripts/systemd-autofs-restart.sh"
Headers show

Patch hide | download patch | download mbox

diff --git a/Makefile.install b/Makefile.install
index 6fcf25e25562..9e9f8e646705 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -8,6 +8,7 @@  SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
 LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
 LIBDIR		?= $(PREFIX)/lib
 INCLUDEDIR	?= $(PREFIX)/include/criu
+LIBEXECDIR	?= $(PREFIX)/lib/libexec
 
 #
 # For recent Debian/Ubuntu with multiarch support.
@@ -23,12 +24,13 @@  else
 endif
 
 export SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
-export INCLUDEDIR LIBDIR DESTDIR PREFIX
+export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR
 
 install-tree:
 	$(Q) mkdir -p $(DESTDIR)$(SYSTEMDUNITDIR)
 	$(Q) mkdir -p $(DESTDIR)$(LOGROTATEDIR)
 	$(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)
+	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)
 .PHONY: install-tree
 
 install-man:
diff --git a/criu/Makefile b/criu/Makefile
index 1836bde5e1d3..3d46b88bb7f9 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -165,6 +165,8 @@  install: criu
 	$(Q) install -m 755 criu $(DESTDIR)$(SBINDIR)
 	$(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	$(Q) install -m 644 $(UAPI_HEADERS) $(DESTDIR)$(INCLUDEDIR)
+	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/criu/scripts
+	$(Q) install -m 755 $(SRC_DIR)/scripts/systemd-autofs-restart.sh $(DESTDIR)$(LIBEXECDIR)/criu/scripts
 .PHONY: install
 
 #