diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-05-27 15:21:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-05-30 09:45:43 +0200 |
| commit | e355e54f2fddcf3146f33c9690e580e6b77aacef (patch) | |
| tree | be5c00928059bc4001be044030940592cc498c65 /external/librevenge | |
| parent | tdf#89329: use unique_ptr for pImpl in fltrcfg (diff) | |
| download | core-e355e54f2fddcf3146f33c9690e580e6b77aacef.tar.gz core-e355e54f2fddcf3146f33c9690e580e6b77aacef.zip | |
configure: set BOOST_CPPFLAGS also in --without-system-boost case
Simplify the makefiles.
Change-Id: Ia695961e936e4a1ffdaff73eb56adc3c3905ed0c
Diffstat (limited to 'external/librevenge')
| -rw-r--r-- | external/librevenge/ExternalProject_librevenge.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk index 3c2efc0df9d2..903ee55d9749 100644 --- a/external/librevenge/ExternalProject_librevenge.mk +++ b/external/librevenge/ExternalProject_librevenge.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) : --disable-generators \ --without-docs \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && $(MAKE) \ |