diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-09-05 16:50:03 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-09-05 16:50:03 +0000 |
| commit | 824a67ae0460af3e5e21ee9977e58d1bb69912e6 (patch) | |
| tree | 1b78a58644b340c5437c211a8c1fff425edb71b1 | |
| parent | 7be746fbeb76be6cb6d106d39a03cf59655a7160 (diff) | |
| download | netpbm-mirror-824a67ae0460af3e5e21ee9977e58d1bb69912e6.tar.gz netpbm-mirror-824a67ae0460af3e5e21ee9977e58d1bb69912e6.tar.xz netpbm-mirror-824a67ae0460af3e5e21ee9977e58d1bb69912e6.zip | |
Use PKG_CONFIG variable
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3941 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | GNUmakefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index ebfb6d10..7389c16a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -322,8 +322,8 @@ ifneq ($(LINUXSVGALIB),NONE) MERGELIBS += $(LINUXSVGALIB) endif -ifneq ($(shell pkg-config --modversion libpng$(PNGVER)),) - PNGLD = $(shell pkg-config --libs libpng$(PNGVER)) +ifneq ($(shell $(PKG_CONFIG) --modversion libpng$(PNGVER)),) + PNGLD = $(shell $(PKG_CONFIG) --libs libpng$(PNGVER)) else ifneq ($(shell libpng$(PNGVER)-config --version),) PNGLD = $(shell libpng$(PNGVER)-config --ldflags) @@ -332,8 +332,8 @@ else endif endif -ifneq ($(shell pkg-config --modversion libxml-2.0),) - XML2LD=$(shell pkg-config --libs libxml-2.0) +ifneq ($(shell $(PKG_CONFIG) --modversion libxml-2.0),) + XML2LD=$(shell $(PKG_CONFIG) --libs libxml-2.0) else ifneq ($(shell xml2-config --version),) XML2LD=$(shell xml2-config --libs) @@ -342,8 +342,8 @@ else endif endif -ifneq ($(shell pkg-config x11 --libs),) - X11LD = $(shell pkg-config x11 --libs) +ifneq ($(shell $(PKG_CONFIG) x11 --libs),) + X11LD = $(shell $(PKG_CONFIG) x11 --libs) else X11LD = $(shell $(LIBOPT) $(LIBOPTR) $(X11LIB)) endif |