summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-27 16:25:22 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-27 18:09:01 +0100
commita957ec02f4071ebabd36e8087fd5d5173eb734de (patch)
tree4268a5a065ca8d76170f58599e1879e21f78523a
parentd729d169de479e622e8767edd72aee3ae5bc61a9 (diff)
normalize values of WITH_COMPAT_OOWRAPPERS
Change-Id: Ia397d944edf2a06a83e42dd792fc80906978e1bc
-rwxr-xr-xbin/distro-install-desktop-integration4
-rw-r--r--configure.ac2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 9589af6d36dd..0379ffaa416b 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -69,7 +69,7 @@ add_wrapper()
# do we want compat oowrapper?
oowrapper_name=""
- if test "$WITH_COMPAT_OOWRAPPERS" = 'YES' ; then
+ if test "$WITH_COMPAT_OOWRAPPERS" = 'TRUE' ; then
oowrapper_name=`echo "$lowrapper_name" | sed -e "s/^lo/oo/"`
# "oo" prefix only for wrappers stating with "lo" prefix
test "$oowrapper_name" = "$lowrapper_name" && oowrapper_name=
@@ -181,7 +181,7 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTD
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
-if test "$WITH_COMPAT_OOWRAPPERS" = "YES" ; then
+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
fi
diff --git a/configure.ac b/configure.ac
index 2e7be6c44b99..13ac3dad3e20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12168,7 +12168,7 @@ AC_SUBST(OOO_VENDOR)
AC_MSG_CHECKING([whether to install the compat oo* wrappers])
if test "$with_compat_oowrappers" = "yes"; then
- WITH_COMPAT_OOWRAPPERS=YES
+ WITH_COMPAT_OOWRAPPERS=TRUE
AC_MSG_RESULT(yes)
else
WITH_COMPAT_OOWRAPPERS=