summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorrezso <rezso@rezso.net>2015-12-26 10:51:22 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-01-05 15:40:28 +0000
commit2ec813b4bb8340dea7e4f04cf571a2b2d88a7626 (patch)
treeeb33a5912a2bb1578a47e8c203b83cf3cd0c8a90 /bin
parentc83b55564dab042e3fc1889920cbb4db8fe40117 (diff)
don't use bash completion compatibility dir
Change-Id: I575f6fc9c1605bb7ec07842928f85c2eeadc72f8 Reviewed-on: https://gerrit.libreoffice.org/20954 Reviewed-by: rezso <rezso@rezso.net> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/distro-install-desktop-integration10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index ed31d5ba9dc7..e9332aad9f9a 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -178,12 +178,12 @@ ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand
# create bash completion
-mkdir -p $DESTDIR/etc/bash_completion.d
-./bin/generate-bash-completion bin/bash-completion.in $DESTDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR/usr/share/bash-completion/completions
+./bin/generate-bash-completion bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
+test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
- ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/etc/bash_completion.d/ooffice.sh
- test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
+ ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
+ test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
fi
echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";