[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist]

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

New commits:
commit c6d8cd5f48b3097d8f085318ab86e502f8d4ca15
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu May 16 12:05:42 2013 +0300

    Use cp -R instead of cp -r for OS X compatibility
    
    In GNU cp, -r and -R are equivalent.
    
    For the cp in OS X: "Historic versions of the cp utility had a -r
    option. This implementation supports that option; however, its use is
    strongly discouraged, as it does not correctly copy special files,
    symbolic links, or fifo's."
    
    Using cp -r meant that the symlinks in the LibreOfficePython.framework
    were not properly re-created in instdir.
    
    Change-Id: I8367269a77b876c063fd21ceb919936215fb7d37

diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk
index 893f929..2c0f992 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -24,7 +24,7 @@ gb_GeneratedPackage__get_destdir = $(firstword $(subst :, ,$(1)))
 
 define gb_GeneratedPackage__command_cp
 mkdir -p $(dir $(INSTDIR)/$(2)) && \
-cp -r $(PACKAGE_SOURCEDIR)/$(1) $(INSTDIR)/$(2)
+cp -R $(PACKAGE_SOURCEDIR)/$(1) $(INSTDIR)/$(2)
 endef
 
 define gb_GeneratedPackage__command