[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - comphelper/Library_comphelp.mk tools/Library_tl.mk

[Tor Lillqvist]

 comphelper/Library_comphelp.mk |    4 ++--
 tools/Library_tl.mk            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bac18077450aec272f108bf7e700bfd7fafa33ff
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 13:39:00 2011 +0200

    Revert "Use realpath to avoid pathnames containing symlinks on Cygwin"
    
    This reverts commit ea0f905a00c7b4d7ab31092566671b7613a956ac.

diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 7c365bc..22258a1 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -34,8 +34,8 @@ $(eval $(call gb_Library_add_precompiled_header,comphelper,$(SRCDIR)/comphelper/
 $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
 
 $(eval $(call gb_Library_set_include,comphelper,\
-    -I$(realpath $(SRCDIR)/comphelper/inc/pch) \
-    -I$(realpath $(SRCDIR)/comphelper/source/inc) \
+    -I$(SRCDIR)/comphelper/inc/pch \
+    -I$(SRCDIR)/comphelper/source/inc \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
 ))
commit 00bfbcf96e5a5bbabe5cfe1811fecc96304a19fe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 13:38:50 2011 +0200

    Revert "Use realpath to avoid -I options containing symlinks on Cygwin"
    
    This reverts commit e8701a1e09559ca8b52e39d5ee4da45237f099f8.

diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index eb832ac..180b7bb 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/preco
 
 $(eval $(call gb_Library_set_include,tl,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/tools/inc) \
-    -I$(realpath $(SRCDIR)/tools/inc/pch) \
+    -I$(SRCDIR)/tools/inc \
+    -I$(SRCDIR)/tools/inc/pch \
     -I$(SRCDIR)/solenv/inc \
     -I$(SRCDIR)/solenv/inc/Xp31 \
     -I$(OUTDIR)/inc/offuh \