[Libreoffice-commits] .: 2 commits - bin/distro-install-desktop-integration solenv/gbuild

René Engelhard rene at kemper.freedesktop.org
Tue Nov 29 14:55:04 PST 2011


 bin/distro-install-desktop-integration      |    2 +-
 solenv/gbuild/extensions/post_AuxTargets.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b7b23ac999393c02ec68f19667960183f512bf43
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 29 22:28:58 2011 +0000

    don't remove Makefile on make distclean, we need it now in all cases...

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index a08d46e..962f275 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -71,7 +71,7 @@ clean-build:
 
 distclean: clean
 	if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
-	cd $(SRCDIR) && rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun autom4te.cache \
+	cd $(SRCDIR) && rm -rf Env.Host.sh aclocal.m4 autogen.lastrun autom4te.cache \
 	bin/repo-list build_env config.log config.status configure \
 	desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
 	set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
commit 7f31dfc4b6265b7115f07bc711c969e0e86e5118
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Nov 11 16:46:55 2011 +0000

    fix test: s/==/=/

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index f988e12..6e45285 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -66,7 +66,7 @@ add_wrapper()
 
     # do we want compat oowrapper?
     oowrapper_name=""
-    if test "$WITH_COMPAT_OOWRAPPERS" == 'YES' ; then
+    if test "$WITH_COMPAT_OOWRAPPERS" = 'YES' ; 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=


More information about the Libreoffice-commits mailing list