| @@ -1,36 +1,40 @@ | | | @@ -1,36 +1,40 @@ |
1 | $NetBSD: patch-cd,v 1.3 2010/05/31 17:30:36 drochner Exp $ | | 1 | $NetBSD: patch-cd,v 1.4 2010/05/31 18:30:06 wiz Exp $ |
| | | 2 | |
| | | 3 | sysutils/gio-fam builds the gio/fam backend as a separate module. Force it |
| | | 4 | to link against the installed version of glib2, as it is not rebuilt by the |
| | | 5 | package. |
2 | | | 6 | |
3 | --- gio/fam/Makefile.in.orig 2010-05-03 00:59:22.000000000 +0000 | | 7 | --- gio/fam/Makefile.in.orig 2010-05-03 00:59:22.000000000 +0000 |
4 | +++ gio/fam/Makefile.in | | 8 | +++ gio/fam/Makefile.in |
5 | @@ -76,10 +76,7 @@ am__base_list = \ | | 9 | @@ -76,10 +76,7 @@ am__base_list = \ |
6 | am__installdirs = "$(DESTDIR)$(giomoduledir)" | | 10 | am__installdirs = "$(DESTDIR)$(giomoduledir)" |
7 | LTLIBRARIES = $(giomodule_LTLIBRARIES) | | 11 | LTLIBRARIES = $(giomodule_LTLIBRARIES) |
8 | am__DEPENDENCIES_1 = | | 12 | am__DEPENDENCIES_1 = |
9 | -libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ | | 13 | -libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ |
10 | - $(top_builddir)/gobject/libgobject-2.0.la \ | | 14 | - $(top_builddir)/gobject/libgobject-2.0.la \ |
11 | - $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \ | | 15 | - $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \ |
12 | - $(am__DEPENDENCIES_1) | | 16 | - $(am__DEPENDENCIES_1) |
13 | +libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1) | | 17 | +libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1) |
14 | am__objects_1 = | | 18 | am__objects_1 = |
15 | am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ | | 19 | am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ |
16 | libgiofam_la-fam-module.lo \ | | 20 | libgiofam_la-fam-module.lo \ |
17 | @@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \ | | 21 | @@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \ |
18 | | | 22 | |
19 | libgiofam_la_LDFLAGS = $(module_flags) | | 23 | libgiofam_la_LDFLAGS = $(module_flags) |
20 | libgiofam_la_LIBADD = \ | | 24 | libgiofam_la_LIBADD = \ |
21 | - $(top_builddir)/gio/libgio-2.0.la \ | | 25 | - $(top_builddir)/gio/libgio-2.0.la \ |
22 | - $(top_builddir)/gobject/libgobject-2.0.la \ | | 26 | - $(top_builddir)/gobject/libgobject-2.0.la \ |
23 | - $(top_builddir)/glib/libglib-2.0.la \ | | 27 | - $(top_builddir)/glib/libglib-2.0.la \ |
24 | + $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \ | | 28 | + $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \ |
25 | $(GLIB_LIBS) \ | | 29 | $(GLIB_LIBS) \ |
26 | $(FAM_LIBS) \ | | 30 | $(FAM_LIBS) \ |
27 | $(NULL) | | 31 | $(NULL) |
28 | @@ -777,7 +772,7 @@ check-local: test | | 32 | @@ -777,7 +772,7 @@ check-local: test |
29 | | | 33 | |
30 | install-data-hook: | | 34 | install-data-hook: |
31 | if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ | | 35 | if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ |
32 | - $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ | | 36 | - $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ |
33 | + ${LOCALBASE}/bin/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ | | 37 | + ${LOCALBASE}/bin/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ |
34 | fi | | 38 | fi |
35 | | | 39 | |
36 | uninstall-local: | | 40 | uninstall-local: |