[gvfs] build: Install bash completion files in /usr/share/



commit 6ff5e43a1155ac438d7fecb4d2c94318bfc12392
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Fri Jun 22 15:13:16 2012 +0200

    build: Install bash completion files in /usr/share/
    
    bash-completion upstream has changed the preferred location for completion
    scripts, let's make it consistent across our stack.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678537

 configure.ac                                       |    4 ++--
 programs/Makefile.am                               |    4 ++--
 .../{gvfs-bash-completion.sh => completion/gvfs}   |    0
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a8f5525..f1786ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,9 +649,9 @@ AM_CONDITIONAL(ENABLE_BASHCOMP, test "$msg_bash_completion" = "yes")
 
 AC_ARG_WITH([bash-completion-dir],
 	    AC_HELP_STRING([--with-bash-completion-dir=PATH],
-	    		   [choose directory for bash-completion file (default=SYSCONFDIR/profile.d)]),
+	    		   [choose directory for bash-completion file (default=DATADIR/bash-completion/completions)]),
 	    with_bashcomp_dir=$withval,
-	    with_bashcomp_dir=$sysconfdir/profile.d)
+	    with_bashcomp_dir=$datadir/bash-completion/completions)
 BASHCOMP_DIR=$with_bashcomp_dir
 AC_SUBST(BASHCOMP_DIR)
 
diff --git a/programs/Makefile.am b/programs/Makefile.am
index f99eaef..d268c71 100644
--- a/programs/Makefile.am
+++ b/programs/Makefile.am
@@ -35,7 +35,7 @@ bin_SCRIPTS =					\
 
 if ENABLE_BASHCOMP
 profiledir = $(BASHCOMP_DIR)
-profile_DATA = gvfs-bash-completion.sh
+profile_DATA = completion/gvfs
 endif
 
 gvfs_cat_SOURCES = gvfs-cat.c
@@ -89,4 +89,4 @@ gvfs_mkdir_LDADD = $(libraries)
 gvfs_mime_SOURCES = gvfs-mime.c
 gvfs_mime_LDADD = $(libraries)
 
-EXTRA_DIST = gvfs-less gvfs-bash-completion.sh
+EXTRA_DIST = gvfs-less completion/gvfs
diff --git a/programs/gvfs-bash-completion.sh b/programs/completion/gvfs
similarity index 100%
rename from programs/gvfs-bash-completion.sh
rename to programs/completion/gvfs



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]