[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/gbuild

[Matúš Kukan]

 configure.ac             |    3 ---
 solenv/gbuild/Package.mk |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit dbea75feea1622cbe746486e0faa9308874dc88e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Sep 18 14:26:17 2013 +0200

    make dependency on directory order-only
    
    Change-Id: I800a7c1ea7ae48252a22ab1dc848fdc5e6f6b3b9

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 595ad85..ed0f3ba 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -136,7 +136,7 @@ define gb_Package_add_symbolic_link
 $(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_symbolic_link requires 3 arguments))
 $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
-$$(gb_Package_OUTDIR_$(1))/$(2) : $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir
+$$(gb_Package_OUTDIR_$(1))/$(2) :| $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir
 	rm -f $$@ && ln -s $(3) $$@
 
 $(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
commit 6a66cfe6aab8298cf5bc7c1a870bafcee9dd2146
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Sep 18 09:22:28 2013 +0200

    remove unused EXEEXT_FOR_BUILD
    
    Change-Id: I6ac851e3ba418bb681f69f5417c74688776498be

diff --git a/configure.ac b/configure.ac
index 0bcbfae..880732e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,11 +164,9 @@ BUILDDIR=`pwd`
 cd $srcdir
 SRC_ROOT=`pwd`
 cd $BUILDDIR
-EXEEXT_FOR_BUILD=
 x_Cygwin=[\#]
 
 if test "$build_os" = "cygwin"; then
-    EXEEXT_FOR_BUILD=.exe
     PathFormat "$SRC_ROOT"
     SRC_ROOT="$formatted_path"
     PathFormat "$BUILDDIR"
@@ -178,7 +176,6 @@ fi
 
 AC_SUBST(SRC_ROOT)
 AC_SUBST(BUILDDIR)
-AC_SUBST(EXEEXT_FOR_BUILD)
 AC_SUBST(x_Cygwin)
 AC_DEFINE_UNQUOTED(SRCDIR,"$SRC_ROOT")
 AC_DEFINE_UNQUOTED(BUILDDIR,"$BUILDDIR")