diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:08:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:08:23 +0000 |
| commit | 62e5894bc767fc440c8d11d4f04cd327f6a2bbc5 (patch) | |
| tree | eeef4a00d709264cb4cec0b82e814b516ee4ce3c /solenv/inc/pkg_config.mk | |
| parent | 5f61c7be71bcb4851a5035e896b2f175ed88926d (diff) | |
INTEGRATION: CWS sb83 (1.4.20); FILE MERGED
2008/01/28 11:18:28 sb 1.4.20.1: adapted to scenarios where a PKG_CONFIG environment variable is already set (typically to build moz)
Diffstat (limited to 'solenv/inc/pkg_config.mk')
| -rw-r--r-- | solenv/inc/pkg_config.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/pkg_config.mk b/solenv/inc/pkg_config.mk index 67f723eab5c0..1dd5093d61e7 100644 --- a/solenv/inc/pkg_config.mk +++ b/solenv/inc/pkg_config.mk @@ -4,9 +4,9 @@ # # $RCSfile: pkg_config.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2007-11-06 15:44:26 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:08:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -36,14 +36,14 @@ .INCLUDE .IGNORE : pkgroot.mk .IF "$(PKGCONFIG_ROOT)"!="" -PKGCONFIG=$(PKGCONFIG_ROOT)$/bin$/pkg-config +PKG_CONFIG=$(PKGCONFIG_ROOT)$/bin$/pkg-config PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig .EXPORT : PKG_CONFIG_PATH PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT) .ELSE # "$(OS)"=="SOLARIS" -PKGCONFIG=pkg-config +PKG_CONFIG*=pkg-config .ENDIF # "$(OS)"=="SOLARIS" -PKGCONFIG_CFLAGS:=$(shell @$(PKGCONFIG) $(PKGCONFIG_PREFIX) --cflags $(PKGCONFIG_MODULES)) -PKGCONFIG_LIBS:=$(shell @$(PKGCONFIG) $(PKGCONFIG_PREFIX) --libs $(PKGCONFIG_MODULES)) +PKGCONFIG_CFLAGS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --cflags $(PKGCONFIG_MODULES)) +PKGCONFIG_LIBS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --libs $(PKGCONFIG_MODULES)) CFLAGS+=$(PKGCONFIG_CFLAGS) |