[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 38516ee43194fd496971a9c37e23109f3816e4bf

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit dd30aa427cdac181b30ce0fdee122dc8b524701b
Author: Guillaume Rousse <guillaume at oberkampf.msr-inria.inria.fr>
Date:   Tue Dec 29 23:50:08 2009 +0100

    substitute path to bash_completion time in profile script according to actual installation path

diff --git a/Makefile.am b/Makefile.am
index 0dc3c47..5b1a061 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,5 +155,10 @@ bashcomp_DATA = contrib/abook \
 profiledir = $(sysconfdir)/profile.d
 profile_DATA = bash_completion.sh
 
-EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) $(profile_DATA) \
+bash_completion.sh: bash_completion.sh.in Makefile
+	sed -e 's|@sysconfdir[@]|$(sysconfdir)|' <$(srcdir)/$@.in >$@
+
+CLEANFILES = bash_completion.sh
+
+EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) bash_completion.sh.in \
 	contrib/_modules contrib/_subversion contrib/_yum contrib/_yum-utils
diff --git a/bash_completion.sh b/bash_completion.sh
index ee1220e..1ee0914 100644
--- a/bash_completion.sh
+++ b/bash_completion.sh
@@ -5,6 +5,6 @@
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}
 if [ $bmajor -ge 3 -a -r /etc/bash_completion ]; then
     # Source completion code.
-    . /etc/bash_completion
+    . /usr/local/etc/bash_completion
 fi
 unset bash bmajor
diff --git a/bash_completion.sh b/bash_completion.sh.in
similarity index 90%
copy from bash_completion.sh
copy to bash_completion.sh.in
index ee1220e..2ea07f7 100644
--- a/bash_completion.sh
+++ b/bash_completion.sh.in
@@ -5,6 +5,6 @@
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}
 if [ $bmajor -ge 3 -a -r /etc/bash_completion ]; then
     # Source completion code.
-    . /etc/bash_completion
+    . @sysconfdir@/bash_completion
 fi
 unset bash bmajor

-- 
bash-completion