diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-11-28 20:27:36 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-11-28 20:27:36 +0000 |
| commit | 3927178ead14723281af625609f706f238e0dc51 (patch) | |
| tree | 5f2d02f7e987827aa4778ec20c10ae279ef50ffa /other | |
| parent | c267823f944001e096f0e316588a56a4011435a9 (diff) | |
| download | netpbm-mirror-3927178ead14723281af625609f706f238e0dc51.tar.gz netpbm-mirror-3927178ead14723281af625609f706f238e0dc51.tar.xz netpbm-mirror-3927178ead14723281af625609f706f238e0dc51.zip | |
Add PKG_CONFIG config variable
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2840 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'other')
| -rw-r--r-- | other/pamx/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/other/pamx/Makefile b/other/pamx/Makefile index 4e06e0fd..e4892540 100644 --- a/other/pamx/Makefile +++ b/other/pamx/Makefile @@ -9,7 +9,7 @@ include $(BUILDDIR)/config.mk EXTERN_INCLUDE = -ifeq ($(shell pkg-config x11 --modversion --silence-errors),) +ifeq ($(shell $(PKG_CONFIG) x11 --modversion --silence-errors),) # Pkg-config has never heard of X11, or doesn't even exist ifneq ($(X11LIB),NONE) @@ -20,8 +20,8 @@ ifeq ($(shell pkg-config x11 --modversion --silence-errors),) endif else HAVE_X11LIB = Y - X11LIB = $(shell pkg-config x11 --libs) - EXTERN_INCLUDES += $(shell pkg-config x11 --cflags) + X11LIB = $(shell $(PKG_CONFIG) x11 --libs) + EXTERN_INCLUDES += $(shell $(PKG_CONFIG) x11 --cflags) endif ifeq ($(HAVE_X11LIB),Y) @@ -46,10 +46,10 @@ all: $(BINARIES) include $(SRCDIR)/common.mk -ifeq ($(shell pkg-config x11 --libs),) +ifeq ($(shell $(PKG_CONFIG) x11 --libs),) X11_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(X11LIB)) else - X11_LIBOPTS = $(shell pkg-config x11 --libs) + X11_LIBOPTS = $(shell $(PKG_CONFIG) x11 --libs) endif pamx: image.o send.o window.o |