diff options
| author | Ondrej Holy <oholy@redhat.com> | 2016-05-31 09:12:12 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2016-05-31 09:16:42 +0200 |
| commit | 85af0e5a26dcdbb86811d28005ae59e7432388dc (patch) | |
| tree | de82f9697f6077fcec777f3ada679d34e8a42ee8 /test | |
| parent | e7805890fa56a8d32a9e27f3e5e22fcfeda31d8a (diff) | |
| download | gvfs-85af0e5a26dcdbb86811d28005ae59e7432388dc.tar.gz | |
build: Fix srcdir != builddir
Commit 0188305 broke build, because doesn't expect srcdir != builddir
and consequently the build fails with the following error:
make[3]: *** No rule to make target '../../daemon/org.gtk.vfs.Daemon.service', needed by 'all-am'. Stop.
make[3]: *** Waiting for unfinished jobs....
Use builddir instead of srcdir to fix the problem.
https://bugzilla.gnome.org/show_bug.cgi?id=734370
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 02239e7c..6b46d575 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -31,41 +31,41 @@ org.gtk.vfs.Metadata.service: $(top_srcdir)/metadata/org.gtk.vfs.Metadata.servic $(AM_V_GEN) ln -s $(top_srcdir)/monitor/$(*F)/$(@F) $@ CONFIG_FILES=session.conf org.gtk.vfs.Daemon.service org.gtk.vfs.Metadata.service -CONFIG_FILES_INSTALLED=session.conf $(top_srcdir)/daemon/org.gtk.vfs.Daemon.service $(top_srcdir)/metadata/org.gtk.vfs.Metadata.service +CONFIG_FILES_INSTALLED=session.conf $(top_builddir)/daemon/org.gtk.vfs.Daemon.service $(top_builddir)/metadata/org.gtk.vfs.Metadata.service if USE_AFC org.gtk.vfs.AfcVolumeMonitor.service: $(top_srcdir)/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/afc|" $< > $@ CONFIG_FILES+=org.gtk.vfs.AfcVolumeMonitor.service afc.monitor -CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service afc.monitor +CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service afc.monitor endif if USE_GDU org.gtk.vfs.GduVolumeMonitor.service: $(top_srcdir)/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/gdu|" $< > $@ CONFIG_FILES+=org.gtk.vfs.GduVolumeMonitor.service gdu.monitor -CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/afc/org.gtk.vfs.GduVolumeMonitor.service gdu.monitor +CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/afc/org.gtk.vfs.GduVolumeMonitor.service gdu.monitor endif if USE_GPHOTO2 org.gtk.vfs.GPhoto2VolumeMonitor.service: $(top_srcdir)/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/gphoto2|" $< > $@ CONFIG_FILES+=org.gtk.vfs.GPhoto2VolumeMonitor.service gphoto2.monitor -CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service gphoto2.monitor +CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service gphoto2.monitor endif if USE_HAL org.gtk.vfs.HalVolumeMonitor.service: $(top_srcdir)/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/hal|" $< > $@ CONFIG_FILES+=org.gtk.vfs.HalVolumeMonitor.service hal.monitor -CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service hal.monitor +CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/hal/org.gtk.vfs.HalVolumeMonitor.service hal.monitor endif if USE_UDISKS2 org.gtk.vfs.UDisks2VolumeMonitor.service: $(top_srcdir)/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in ../config.log $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/udisks2|" $< > $@ CONFIG_FILES+=org.gtk.vfs.UDisks2VolumeMonitor.service udisks2.monitor -CONFIG_FILES_INSTALLED+=$(top_srcdir)/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service udisks2.monitor +CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service udisks2.monitor endif noinst_DATA += $(CONFIG_FILES) |