[Libreoffice-commits] .: Branch 'libreoffice-3-4-0' - nlpsolver/makefile.mk

[Thorsten Behrens]

 nlpsolver/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d566f6786666eb19b35e1db1b332fbef4ed74cd
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>
    (cherry picked from commit a22d8e9fbecfe6f2febdf4f85892f00e48ad0b79)
    
    Signed-off-by: Andras Timar <timar74 at gmail.com>
    Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen at gmail.com>

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=