From 53b98e6983148069e5424251bd73e2ff3ff74df5 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 2 Mar 2018 09:23:49 -0500
Subject: [PATCH 1/2] Install bash-completion under $(ROOT)
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
resources/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/resources/Makefile b/resources/Makefile
index d9ee8f1740b02f6732ee0e0697a6b764725c7187..cbe89b1126b319d253e0101ae4dc1a875f32d4b5 100644
--- a/resources/Makefile
+++ b/resources/Makefile
@@ -150,11 +150,11 @@ install: $(GENPARSE) $(A_INIT) $(ARGBASH_TO) $(COMPLETION)
cp -p $(M4_SRC) "$(ROOT)/$(PREFIXED_LIBDIR)/argbash$(VERSION_SUFFIX)/"
grep -q 'm4dir=' $(GENPARSE) && sed -e 's|m4dir=.*|m4dir=/$(PREFIXED_LIBDIR)/argbash$(VERSION_SUFFIX)|' $(GENPARSE) > "$(ROOT)/$(PREFIX)/bin/argbash$(VERSION_SUFFIX)"
test -n "$(VERSION_SUFFIX)" || test -z "$(ARGBASH_TO)" || { cp -p $(ARGBASH_TO) "$(ROOT)/$(PREFIX)/bin" && chmod a+x "$(ROOT)/$(PREFIX)"/bin/argbash-*; }
cp -p $(A_INIT) "$(ROOT)/$(PREFIX)/bin/argbash-init$(VERSION_SUFFIX)" && chmod a+x "$(ROOT)/$(PREFIX)"/bin/argbash-init$(VERSION_SUFFIX)
chmod a+x "$(ROOT)/$(PREFIX)/bin/argbash$(VERSION_SUFFIX)"
- test "$(INSTALL_COMPLETION)" = "no" || mkdir -p "$(SYSCONFDIR)/bash_completion.d" && mv "$(COMPLETION)" "$(SYSCONFDIR)/bash_completion.d/"
+ test "$(INSTALL_COMPLETION)" = "no" || mkdir -p "$(ROOT)/$(SYSCONFDIR)/bash_completion.d" && mv "$(COMPLETION)" "$(ROOT)/$(SYSCONFDIR)/bash_completion.d/"
altpreclean: define-version
$(RM) "$(ROOT)/$(PREFIX)/bin/argbash-$(VERSION_MAJOR).$(VERSION_MINOR)"
$(RM) "$(ROOT)/$(PREFIX)/bin/argbash-$(VERSION_MAJOR)"
$(RM) "$(ROOT)/$(PREFIX)/bin/argbash"
@@ -168,11 +168,11 @@ uninstall:
$(RM) "$(ROOT)/$(PREFIX)/bin/argbash"
$(RM) "$(ROOT)/$(PREFIXED_LIBDIR)/argbash$(VERSION_SUFFIX)/"*.m4
$(RM) "$(ROOT)/$(PREFIXED_LIBDIR)/argbash$(VERSION_SUFFIX)/version"
$(RM) "$(ROOT)/$(PREFIX)"/bin/argbash-*
rmdir "$(ROOT)/$(PREFIXED_LIBDIR)/argbash$(VERSION_SUFFIX)"
- $(RM) "$(SYSCONFDIR)/bash_completion.d/$(COMPLETION)"
+ $(RM) "$(ROOT)/$(SYSCONFDIR)/bash_completion.d/$(COMPLETION)"
altuninstall: define-version uninstall
version:
@test -n '$(VERSION)' || { echo "You have to specify a version string, for example 'make version VERSION=1.0.0'"; exit 1; }
--
2.14.3