From 9e7acdc2f6bb4179724634cf91350e837e0ec7aa Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 17 Feb 2019 11:55:06 +0100
Subject: Fixing inconsistent variable usage in makefile.

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 777546a..81ada15 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,9 @@ build: share/man/*.txt
 	sed -n '/^NAME/,$$p' share/man/$(SOFTWARE).7.txt > README.txt
 
 install: build
-	mkdir -p $(DESTDIR)/etc/${SOFTWARE}/config
-	mkdir -p $(DESTDIR)/etc/${SOFTWARE}/debconf
-	mkdir -p $(DESTDIR)/etc/${SOFTWARE}/hooks
+	mkdir -p $(DESTDIR)/etc/$(SOFTWARE)/config
+	mkdir -p $(DESTDIR)/etc/$(SOFTWARE)/debconf
+	mkdir -p $(DESTDIR)/etc/$(SOFTWARE)/hooks
 
 	mkdir -p $(DESTDIR)/usr/bin
 	cp -r bin/* $(DESTDIR)/usr/bin
@@ -68,7 +68,7 @@ install: build
 	cp -r lib/* $(DESTDIR)/usr/lib/$(SOFTWARE)
 
 	mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE)
-	cp -r VERSION.txt share/config share/hooks share/scripts ${DESTDIR}/usr/share/$(SOFTWARE)
+	cp -r VERSION.txt share/config share/hooks share/scripts $(DESTDIR)/usr/share/$(SOFTWARE)
 
 	mkdir -p $(DESTDIR)/usr/share/bash-completion/completions
 	cp -r share/bash-completion/* $(DESTDIR)/usr/share/bash-completion/completions
@@ -99,13 +99,13 @@ install: build
 	ln -sf container.1 $(DESTDIR)/usr/share/man/man1/cnt.1
 	ln -sf container-shell $(DESTDIR)/usr/bin/cntsh
 	ln -sf container-shell.1 $(DESTDIR)/usr/share/man/man1/cntsh.1
-	ln -sf container ${DESTDIR}/usr/share/bash-completion/completions/cnt
+	ln -sf container $(DESTDIR)/usr/share/bash-completion/completions/cnt
 
-	ln -sf debconf ${DESTDIR}/usr/share/$(SOFTWARE)/scripts/debian
-	ln -sf debconf.d ${DESTDIR}/usr/share/$(SOFTWARE)/scripts/debian.d
+	ln -sf debconf $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/debian
+	ln -sf debconf.d $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/debian.d
 	ln -sf container-create-debconf.1 $(DESTDIR)/usr/share/man/man1/container-create-debian.1
-	ln -sf debconf ${DESTDIR}/usr/share/$(SOFTWARE)/scripts/progress-linux
-	ln -sf debconf.d ${DESTDIR}/usr/share/$(SOFTWARE)/scripts/progress-linux.d
+	ln -sf debconf $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/progress-linux
+	ln -sf debconf.d $(DESTDIR)/usr/share/$(SOFTWARE)/scripts/progress-linux.d
 	ln -sf container-create-debconf.1 $(DESTDIR)/usr/share/man/man1/container-create-progress-linux.1
 
 	ln -sf console $(DESTDIR)/usr/lib/$(SOFTWARE)/container/con
@@ -143,7 +143,7 @@ uninstall:
 	rm -f $(DESTDIR)/usr/share/man/man1/cnt.1
 	rm -f $(DESTDIR)/usr/bin/cntsh
 	rm -f $(DESTDIR)/usr/share/man/man1/cntsh.1
-	rm -f ${DESTDIR}/usr/share/bash-completion/completions/cnt
+	rm -f $(DESTDIR)/usr/share/bash-completion/completions/cnt
 
 	for FILE in share/sudo/*; \
 	do \
@@ -180,10 +180,10 @@ uninstall:
 	done
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true
 
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE}/config || true
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE}/debconf || true
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE}/hooks || true
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE} || true
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE)/config || true
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE)/debconf || true
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE)/hooks || true
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/$(SOFTWARE) || true
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc || true
 
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true
-- 
cgit v1.2.3