summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-05-16 12:05:42 +0300
committerTor Lillqvist <tml@iki.fi>2013-05-16 13:19:31 +0300
commitc6d8cd5f48b3097d8f085318ab86e502f8d4ca15 (patch)
tree74ce595144aaaf83899fbca3c84c38d4874d11a0
parenta140350dae5db298094583763daf0a8bed8480cb (diff)
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
-rw-r--r--solenv/gbuild/GeneratedPackage.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk
index 893f929cbb45..2c0f992d708d 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