[Libreoffice-commits] .: 2 commits -
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jun 6 05:12:50 PDT 2011
0 files changed
New commits:
commit a3e75ff235b3cd41f5887a72cd8c95a37bfbbdb0
Merge: 2aaa7ba... a22d8e9...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 6 12:53:09 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit a22d8e9fbecfe6f2febdf4f85892f00e48ad0b79
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri May 20 09:22:24 2011 +0200
Removed GNUism in makefile
The --preserve=timestamps is a gnu cp extension, and thus not
available on all our platforms. Replaced by equivalent tar hack.
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk
index ec7a063..a7d0996 100644
--- a/nlpsolver/makefile.mk
+++ b/nlpsolver/makefile.mk
@@ -46,7 +46,7 @@ PATCH_FILES=nlpsolver-0.9.patch
ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
-CONFIGURE_ACTION=cp -rv --preserve=timestamps ../../../../locale src/
+CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/ && $(GNUTAR) xf -)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
More information about the Libreoffice-commits
mailing list