From 09b0b6ac347e19348e17a9029cfc709fd84c5d4b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 4 Feb 2012 17:27:22 +0000 Subject: [PATCH] defs.mk: Beautify pkg-config evaluation --- make/defs.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 36e10ec4..9bb96a2e 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -4,7 +4,6 @@ ifndef YTOOLS_DEF_MK_INCLUDED YTOOLS_DEF_MK_INCLUDED = true - include $(MODDIR)/make/platform.mk # ----- pre-local.mk @@ -1290,9 +1289,9 @@ ifeq ($(USE_GLIB),true) LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0) endif ifeq ($(ARCH),x86_64) - PROJECT_CFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0) - PROJECT_CPPFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0) - LIBFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0) + PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --cflags glib-2.0) + PROJECT_CPPFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --cflags glib-2.0) + LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --libs glib-2.0) endif LIBFLAGS += -ldl -lpthread else