solenv/gbuild/LinkTarget.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 0e35a8c14a6e757e53c6aed4e7e2b5d4dd30d768
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Apr 22 12:35:38 2013 +0200
gbuild: LinkTarget: try to fix gb_LinkTarget_add_auxtarget for make 3.81
Apparently make 3.81 has trouble with the wildcard in there, it never
seems to find the file... implement the test in shell instead, since we
invoke a command on both branches it shouldn't be slower.
Change-Id: I93cc2cf09ae8af1d9379fde314a44ef92a28b434
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index da0018f..871105e 100755
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1236,7 +1236,13 @@ endef
# are the LinkTargets) and doing an incremental build.
define gb_LinkTarget_add_auxtarget
$(2) : $(call gb_LinkTarget_get_target,$(1))
- $$(if $$(wildcard $$@),touch -r $$< $$@,rm -f $$<; echo "ERROR:
aux-target missing, library deleted, please try again"; false)
+ if test -e $$@; then \
+ touch -r $$< $$@; \
+ else \
+ rm -f $$<; \
+ echo "ERROR: aux-target missing, library deleted, please try
running make again"; \
+ false; \
+ fi
$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS += $(2)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
