[Libreoffice-commits] .: liborcus/makefile.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Sep 7 08:18:11 PDT 2012


 liborcus/makefile.mk |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit a6610e9e48327d2f4cc2a0c1cc0dea3e2f199917
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Sep 7 11:18:00 2012 -0400

    Revert "Specify boost header directory for internal boost."
    
    This reverts commit f721ae074deef795a32ad28289286b5d2667af0d.

diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk
index 0f6b72c..fd04605 100644
--- a/liborcus/makefile.mk
+++ b/liborcus/makefile.mk
@@ -53,13 +53,7 @@ MY_CXXFLAGS = CXXFLAGS=-I$(OUTDIR)/inc/external
 .END
 
 CONFIGURE_DIR=
-CONFIGURE_ACTION=
-
-.IF "$(SYSTEM_BOOST)" != "YES"
-CONFIGURE_ACTION+=export CPPFLAGS="$(CPPFLAGS) -I$(OUTDIR)/inc/external" &&
-.ENDIF
-
-CONFIGURE_ACTION+=./configure \
+CONFIGURE_ACTION=./configure \
 	--with-pic \
 	--enable-static \
 	--disable-shared \


More information about the Libreoffice-commits mailing list