ios/CustomTarget_MobileLibreOffice_app.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dfe3df890a3649aa0b407d34e0248c74a9e25c2f
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Dec 5 20:07:46 2013 +0200
Make this actually work both when SRCDIR equals and not equals BUILDIR
Change-Id: I0287820bf0b5a1f0645bd032fb1071db5ce168c5
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk
b/ios/CustomTarget_MobileLibreOffice_app.mk
index e517e42..27a029c 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -44,9 +44,9 @@ MobileLibreOffice_setup:
# Libs #
# Create the link flags in the xcconfig for Xcode linkage
all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \
- sed -i '' -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs|" $(LO_XCCONFIG)
+ sed -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs|" <
$(BUILDDIR)/ios/$(LO_XCCONFIG) > $(BUILDDIR)/ios/$(LO_XCCONFIG).new && mv
$(BUILDDIR)/ios/$(LO_XCCONFIG).new $(BUILDDIR)/ios/$(LO_XCCONFIG)
- # Copy lo.xcconfig to source dir for Xcode projects
+ # Copy lo.xcconfig to source dir for the Xcode projects
if test $(SRCDIR) != $(BUILDDIR); then \
cp $(BUILDDIR)/ios/$(LO_XCCONFIG) $(SRCDIR)/ios; \
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
