summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2019-02-17 10:55:06 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2019-02-18 07:24:49 +0000
commit9e7acdc2f6bb4179724634cf91350e837e0ec7aa (patch)
treec65409a23eba1200b6ddc38a4d0a0d3384abb342
parentAdding container log command. (diff)
downloadcompute-tools-9e7acdc2f6bb4179724634cf91350e837e0ec7aa.tar.xz
compute-tools-9e7acdc2f6bb4179724634cf91350e837e0ec7aa.zip
Fixing inconsistent variable usage in makefile.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rw-r--r--Makefile28
1 files changed, 14 insertions, 14 deletions
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