From 1695aa88c331468e0adddbcc5b098a41d26dbfa6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 11 Apr 2021 14:21:55 +0200
Subject: Using /usr/libexec/container instead of
 /usr/libexec/open-infrastructure/container.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ade4dbc..1d31199 100644
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,8 @@ install: build
 	mkdir -p $(DESTDIR)/usr/bin
 	cp -r bin/* $(DESTDIR)/usr/bin
 
-	mkdir -p $(DESTDIR)/usr/libexec/$(PROJECT)
-	cp -r libexec/* $(DESTDIR)/usr/libexec/$(PROJECT)
+	mkdir -p $(DESTDIR)/usr/libexec
+	cp -r libexec/* $(DESTDIR)/usr/libexec
 
 	mkdir -p $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
 	cp -r VERSION.txt $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
@@ -111,14 +111,14 @@ install: build
 	ln -sf debootstrap $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/scripts/mmdebstrap
 	ln -sf container-create-debootstrap.1 $(DESTDIR)/usr/share/man/man1/container-create-mmdebstrap.1
 
-	ln -sf create $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/cr
-	ln -sf list $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/ls
-	ln -sf move $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/mv
-	ln -sf remove $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/rm
-	ln -sf restart $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/rs
-	ln -sf start $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/s
-	ln -sf status $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/st
-	ln -sf stop $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)/t
+	ln -sf create $(DESTDIR)/usr/libexec/$(PROGRAM)/cr
+	ln -sf list $(DESTDIR)/usr/libexec/$(PROGRAM)/ls
+	ln -sf move $(DESTDIR)/usr/libexec/$(PROGRAM)/mv
+	ln -sf remove $(DESTDIR)/usr/libexec/$(PROGRAM)/rm
+	ln -sf restart $(DESTDIR)/usr/libexec/$(PROGRAM)/rs
+	ln -sf start $(DESTDIR)/usr/libexec/$(PROGRAM)/s
+	ln -sf status $(DESTDIR)/usr/libexec/$(PROGRAM)/st
+	ln -sf stop $(DESTDIR)/usr/libexec/$(PROGRAM)/t
 
 	mkdir -p $(DESTDIR)/lib/systemd/system
 	cp -r share/systemd/* $(DESTDIR)/lib/systemd/system
@@ -177,7 +177,7 @@ uninstall:
 	rm -rf $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share || true
 
-	rm -rf $(DESTDIR)/usr/libexec/$(PROJECT)/$(PROGRAM)
+	rm -rf $(DESTDIR)/usr/libexec/$(PROGRAM)
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/libexec || true
 
 	for FILE in bin/*; \
-- 
cgit v1.2.3