| Upstream-Status: Backport [https://github.com/distcc/distcc/pull/363] |
| Signed-off-by: Ross Burton <ross.burton@intel.com> |
| |
| From 469628ee8dc90c7162d1a850c0b179b7349f9cf3 Mon Sep 17 00:00:00 2001 |
| From: Ross Burton <ross.burton@intel.com> |
| Date: Tue, 17 Sep 2019 13:04:22 +0100 |
| Subject: [PATCH] Makefile.in: fix out-of-tree builds when the GNOME UI is |
| enabled |
| |
| The install command doesn't use $(srcdir) so out-of-tree builds fail. |
| |
| Signed-off-by: Ross Burton <ross.burton@intel.com> |
| --- |
| Makefile.in | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/Makefile.in b/Makefile.in |
| index 123054f..b9ce974 100644 |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -1130,8 +1130,8 @@ install-example: $(example_DOCS) |
| install-gnome-data: $(gnome_data) |
| $(mkinstalldirs) "$(DESTDIR)$(icondir)" |
| $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" |
| - $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" |
| - $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" |
| + $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" |
| + $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" |
| |
| install-conf: $(conf_files) $(default_files) |
| $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" |
| -- |
| 2.20.1 |