diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2012-06-22 15:13:16 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-06-22 15:13:16 +0200 |
| commit | 6ff5e43a1155ac438d7fecb4d2c94318bfc12392 (patch) | |
| tree | 4f917ab285984083d8698f7d9af8ff2d272818f1 | |
| parent | e8b4b3309e3e9c85c37d5522a01f24a8914538fc (diff) | |
| download | gvfs-6ff5e43a1155ac438d7fecb4d2c94318bfc12392.tar.gz | |
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
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | programs/Makefile.am | 4 | ||||
| -rwxr-xr-x | programs/completion/gvfs (renamed from programs/gvfs-bash-completion.sh) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a8f5525f..f1786ea3 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 f99eaef0..d268c717 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 index 207b7d86..207b7d86 100755 --- a/programs/gvfs-bash-completion.sh +++ b/programs/completion/gvfs |