diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | libvisio/makefile.mk | 2 | ||||
| -rw-r--r-- | libwpg/makefile.mk | 2 | ||||
| -rw-r--r-- | libwps/makefile.mk | 2 | ||||
| -rwxr-xr-x | set_soenv.in | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index edaf6bfde87e..47a82562bb0b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -532,9 +532,9 @@ ifeq ($(SYSTEM_LIBWPD),YES) define gb_LinkTarget__use_wpd $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(LIBWPD_CFLAGS) \ + $(WPD_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(LIBWPD_LIBS)) +$(call gb_LinkTarget_add_libs,$(1),$(WPD_LIBS)) endef diff --git a/configure.in b/configure.in index 0a2970bc08f8..9605c8f8f76d 100644 --- a/configure.in +++ b/configure.in @@ -4652,15 +4652,15 @@ if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ test "$with_system_libwpd" != "no"; then AC_MSG_RESULT([external]) SYSTEM_LIBWPD=YES - PKG_CHECK_MODULES( LIBWPD, libwpd-0.9 libwpd-stream-0.9 ) + PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 ) else AC_MSG_RESULT([internal]) SYSTEM_LIBWPD=NO BUILD_TYPE="$BUILD_TYPE LIBWPD" fi AC_SUBST(SYSTEM_LIBWPD) -AC_SUBST(LIBWPD_CFLAGS) -AC_SUBST(LIBWPD_LIBS) +AC_SUBST(WPD_CFLAGS) +AC_SUBST(WPD_LIBS) dnl =================================================================== dnl Check for system cppunit diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index ce39d6458675..31b2ad359d4b 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -43,7 +43,7 @@ TARGET=visio # libvisio depends on the libwpd and libwpg .IF "$(SYSTEM_LIBWPD)" == "YES" -INCPRE+=$(LIBWPD_CFLAGS) +INCPRE+=$(WPD_CFLAGS) .ELSE INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk index ff18fbc3e9cd..f37eab815d94 100644 --- a/libwpg/makefile.mk +++ b/libwpg/makefile.mk @@ -43,7 +43,7 @@ TARGET=wpg # libwpg depends on the libwpd framework .IF "$(SYSTEM_LIBWPD)" == "YES" -INCPRE+=$(LIBWPD_CFLAGS) +INCPRE+=$(WPD_CFLAGS) .ELSE INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream diff --git a/libwps/makefile.mk b/libwps/makefile.mk index 91e9dbc0fc78..4ab39f87141d 100644 --- a/libwps/makefile.mk +++ b/libwps/makefile.mk @@ -43,7 +43,7 @@ TARGET=wps # libwps depends on the libwpd framework .IF "$(SYSTEM_LIBWPD)" == "YES" -INCPRE+=$(LIBWPD_CFLAGS) +INCPRE+=$(WPD_CFLAGS) .ELSE INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream diff --git a/set_soenv.in b/set_soenv.in index 09cefdc53891..4700f1d7d2cc 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1901,8 +1901,8 @@ ToFile( "XRANDR_DLOPEN", "@XRANDR_DLOPEN@", "e" ); ToFile( "LIBPNG_CFLAGS", "@LIBPNG_CFLAGS@", "e" ); ToFile( "LIBPNG_LIBS", "@LIBPNG_LIBS@", "e" ); ToFile( "SYSTEM_LIBWPD", "@SYSTEM_LIBWPD@", "e" ); -ToFile( "LIBWPD_CFLAGS", "@LIBWPD_CFLAGS@", "e" ); -ToFile( "LIBWPD_LIBS", "@LIBWPD_LIBS@", "e" ); +ToFile( "WPD_CFLAGS", "@WPD_CFLAGS@", "e" ); +ToFile( "WPD_LIBS", "@WPD_LIBS@", "e" ); ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" ); ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" ); ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" ); |