diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2010-02-09 15:37:10 +0100 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2010-02-09 15:37:10 +0100 |
| commit | a18a1896c0bceaf9a467f00a9678e322d615e786 (patch) | |
| tree | 83999deecc9f5093e2c761b10a85cd85b59d4e1b | |
| parent | b1423ef4ae8883bc38a510fd606377a91fbe6201 (diff) | |
| download | gvfs-a18a1896c0bceaf9a467f00a9678e322d615e786.tar.gz | |
Fix dist issues
- wrong path used in linking common libs
- don't query modules when gio-querymodules is not available
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | monitor/afc/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index c85c8718..4dde3381 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 de6d25fd..a823080f 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 |