From f49c8e4496ffe24c982d7778c33b534e9b0f9b29 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 1 Feb 2011 17:37:37 +0100 Subject: Clean up makefiles --- nlpsolver/makefile.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'nlpsolver/makefile.mk') diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk index 23b642cb58f6..451e1b377c30 100644 --- a/nlpsolver/makefile.mk +++ b/nlpsolver/makefile.mk @@ -42,9 +42,6 @@ TARFILE_MD5=90401bca927835b6fbae4a707ed187c8 TARFILE_NAME=nlpsolver-0.9 TARFILE_ROOTDIR=nlpsolver-0.9 -#ADDITIONAL_FILES= \ -# toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java - PATCH_FILES=nlpsolver-0.9.patch ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR) -- cgit v1.2.3 From a15c75dfb12538e9e0658518144fa95b39513e18 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 4 Mar 2011 16:38:12 +0100 Subject: fix windows build --- nlpsolver/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nlpsolver/makefile.mk') diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk index 451e1b377c30..ec7a06388fae 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 -rpv ../../../../locale src/ +CONFIGURE_ACTION=cp -rv --preserve=timestamps ../../../../locale src/ .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= -- cgit v1.2.3