[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - solenv/gbuild

Petr Mladek pmladek at suse.cz
Tue Mar 19 10:44:32 PDT 2013


 solenv/gbuild/Deliver.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0e016ae93097e1de2c9d315176c2561b691854b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 19 18:05:29 2013 +0100

    touch --no-dereference does not work on MACOSX
    
    Change-Id: I71e8658453e0e96e631cc2ef3996d660950c49cc

diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index ab56dab..1e0fef5 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -60,7 +60,7 @@ endif
 endef
 
 define gb_Deliver__deliver
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2)
+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--no-dereference) -r $(1) $(2)
 endef
 
 ifneq ($(strip $(gb_Deliver_GNUCOPY)),)


More information about the Libreoffice-commits mailing list