[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - solenv/gbuild
Petr Mladek
pmladek at kemper.freedesktop.org
Thu Dec 8 00:52:56 PST 2011
solenv/gbuild/extensions/post_AuxTargets.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit df2b14f11ef36d6d4ecb35e9e2b960e44be90f50
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Dec 8 00:18:46 2011 +0100
fix typo
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index f4c653f..5e11850 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -67,7 +67,7 @@ clean-host:
clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
rm -f solenv/*/bin/dmake*
- $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD),)rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD))
+ $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD)),rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD))
distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
commit 2ae7b690265f1c487e722bd189c94648f6e9e376
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Dec 7 23:50:07 2011 +0100
do not clean INPATH_FOR_BUILD on noncrosscompiles
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index ce4a5cb..f4c653f 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -67,7 +67,7 @@ clean-host:
clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
rm -f solenv/*/bin/dmake*
- rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
+ $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD),)rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD))
distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
More information about the Libreoffice-commits
mailing list