[gvfs] Fix dist issues
- From: Tomas Bzatek <tbzatek src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gvfs] Fix dist issues
- Date: Tue, 9 Feb 2010 14:41:01 +0000 (UTC)
commit a18a1896c0bceaf9a467f00a9678e322d615e786
Author: Tomas Bzatek <tbzatek redhat com>
Date: Tue Feb 9 15:37:10 2010 +0100
Fix dist issues
- wrong path used in linking common libs
- don't query modules when gio-querymodules is not available
Makefile.am | 2 +-
monitor/afc/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c85c871..4dde338 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ distclean-local:
fi
install-data-hook:
- if test -z "$(DESTDIR)" ; then \
+ if test ! -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then \
$(GIO_QUERYMODULES) $(DESTDIR)$(giomodulesdir) ; \
fi
diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am
index de6d25f..a823080 100644
--- a/monitor/afc/Makefile.am
+++ b/monitor/afc/Makefile.am
@@ -26,8 +26,8 @@ gvfs_afc_volume_monitor_LDADD = \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(AFC_LIBS) \
- $(top_srcdir)/common/libgvfscommon.la \
- $(top_srcdir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
+ $(top_builddir)/common/libgvfscommon.la \
+ $(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
$(NULL)
remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]