Revision: 4413
http://gar.svn.sourceforge.net/gar/?rev=4413&view=rev
Author: dmichelsen
Date: 2009-04-19 20:01:09 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
mGAR v2: Added _CATEGORY_PKG_CONFIG_PATH
Modified Paths:
--------------
csw/mgar/gar/v2/categories/x11/category.mk
csw/mgar/gar/v2/gar.conf.mk
Modified: csw/mgar/gar/v2/categories/x11/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/x11/category.mk 2009-04-19 09:24:38 UTC (rev
4412)
+++ csw/mgar/gar/v2/categories/x11/category.mk 2009-04-19 20:01:09 UTC (rev
4413)
@@ -23,12 +23,8 @@
export LDFLAGS CXXFLAGS CFLAGS CPPFLAGS GREP
# pkg-config options
-PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig
-PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/lib/pkgconfig
-PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/X11/lib/pkgconfig
+_CATEGORY_PKG_CONFIG_PATH = $(libdir)/X11/pkgconfig
-export PKG_CONFIG_PATH
-
# Configure common options
CONFIGURE_ARGS = --prefix=/opt/csw/X11
CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11
Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk 2009-04-19 09:24:38 UTC (rev 4412)
+++ csw/mgar/gar/v2/gar.conf.mk 2009-04-19 20:01:09 UTC (rev 4413)
@@ -494,7 +494,7 @@
# This is for foo-config chaos
PKG_CONFIG_DIRS ?= $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS)
-PKG_CONFIG_PATH ?= $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath
$D/$(MM_LIBDIR)/pkgconfig)) $(EXTRA_PKGCONFIG_PATH))
+PKG_CONFIG_PATH ?= $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath
$D/$(MM_LIBDIR)/pkgconfig)) $(_CATEGORY_PKG_CONFIG_PATH)
$(EXTRA_PKG_CONFIG_PATH))
#
# Mirror Sites
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
