| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 1 | Upstream-Status: Backport [https://github.com/distcc/distcc/pull/363] |
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3 | |
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 4 | From 469628ee8dc90c7162d1a850c0b179b7349f9cf3 Mon Sep 17 00:00:00 2001 |
| 5 | From: Ross Burton <ross.burton@intel.com> |
| 6 | Date: Tue, 17 Sep 2019 13:04:22 +0100 |
| 7 | Subject: [PATCH] Makefile.in: fix out-of-tree builds when the GNOME UI is |
| 8 | enabled |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9 | |
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 10 | The install command doesn't use $(srcdir) so out-of-tree builds fail. |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 11 | |
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 12 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 13 | --- |
| 14 | Makefile.in | 4 ++-- |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/Makefile.in b/Makefile.in |
| 18 | index 123054f..b9ce974 100644 |
| 19 | --- a/Makefile.in |
| 20 | +++ b/Makefile.in |
| 21 | @@ -1130,8 +1130,8 @@ install-example: $(example_DOCS) |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | install-gnome-data: $(gnome_data) |
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 23 | $(mkinstalldirs) "$(DESTDIR)$(icondir)" |
| 24 | $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" |
| 25 | - $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" |
| 26 | - $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" |
| 27 | + $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" |
| 28 | + $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 29 | |
| 30 | install-conf: $(conf_files) $(default_files) |
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 31 | $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" |
| 32 | -- |
| 33 | 2.20.1 |