[Libreoffice-commits] .: configure.in
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Mon Sep 26 12:26:49 PDT 2011
configure.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3136120275834b17f9ff628273cee169d171566e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Sep 26 21:22:07 2011 +0200
partially revert 6985b28d533c1324896a1647304499c23e553239 as it breaks the whole idea of testing for bug 20033
diff --git a/configure.in b/configure.in
index f1a38b7..6a98396 100644
--- a/configure.in
+++ b/configure.in
@@ -2552,11 +2552,11 @@ A := \$(wildcard *.a)
.PHONY: all
all: \$(A:.a=.b)
- @echo survived bug20033.
+ @echo survived bug20033. #dont kill these tabs, you will break the Makefile!!!!
.PHONY: setup
setup:
- @touch 1.a 2.a 3.a 4.a 5.a 6.a
+ @touch 1.a 2.a 3.a 4.a 5.a 6.a
define d1
@echo lala \$(1)
@@ -2569,9 +2569,9 @@ define d2
endef
%.b : %.a
- \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
- \$(call d1,\$(CHECKSUM)),\
- \$(call d2,\$(CHECKSUM)))
+ \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+ \$(call d1,\$(CHECKSUM)),\
+ \$(call d2,\$(CHECKSUM)))
EOF
if test -z "`(cd $TESTGMAKEBUG20033 && $GNUMAKE setup && $GNUMAKE -j)|grep survived`"; then
no_parallelism_make="YES"
More information about the Libreoffice-commits
mailing list