summaryrefslogtreecommitdiff
path: root/devel/glib2/patches/patch-cd
blob: d326b611db882e511c90baa2a316de36a56b2199 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
$NetBSD: patch-cd,v 1.4 2010/05/31 18:30:06 wiz Exp $

sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
to link against the installed version of glib2, as it is not rebuilt by the
package.

--- gio/fam/Makefile.in.orig	2010-05-03 00:59:22.000000000 +0000
+++ gio/fam/Makefile.in
@@ -76,10 +76,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(giomoduledir)"
 LTLIBRARIES = $(giomodule_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
-	$(top_builddir)/gobject/libgobject-2.0.la \
-	$(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 =
 am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
 	libgiofam_la-fam-module.lo \
@@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \
 
 libgiofam_la_LDFLAGS = $(module_flags)
 libgiofam_la_LIBADD = \
-		$(top_builddir)/gio/libgio-2.0.la \
-		$(top_builddir)/gobject/libgobject-2.0.la \
-		$(top_builddir)/glib/libglib-2.0.la \
+		$$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \
 		$(GLIB_LIBS) \
 		$(FAM_LIBS) \
 		$(NULL)
@@ -777,7 +772,7 @@ check-local: test
 
 install-data-hook:
 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
+		${LOCALBASE}/bin/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
 	fi
 
 uninstall-local: