[gedit/gnome-3-14] build: fix generation of desktop files for external tools
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/gnome-3-14] build: fix generation of desktop files for external tools
- Date: Sun, 12 Jul 2015 09:32:15 +0000 (UTC)
commit cff568ca9ac94a0564f0751090fde3cde41a3f11
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Jul 12 11:16:04 2015 +0200
build: fix generation of desktop files for external tools
The .desktop files were not generated since there were two rules for the
same targets. So the last rule was executed, which is the mkdir command.
To be sure that the mkdir command is executed before any target is
built, we can use $(shell ...). See:
http://stackoverflow.com/questions/2122602/force-makefile-to-execute-script-before-building-targets
plugins/externaltools/data/Makefile.am | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am
index e3a4707..23098be 100644
--- a/plugins/externaltools/data/Makefile.am
+++ b/plugins/externaltools/data/Makefile.am
@@ -59,5 +59,4 @@ CLEANFILES += \
# generating the .desktop files.
# If the following bug is fixed, this hack can normally be removed:
# https://bugs.launchpad.net/intltool/+bug/605826
-$(externaltools_all_desktop_files):
- $(AM_V_GEN) $(MKDIR_P) $(top_builddir)/plugins/externaltools/data/
+$(shell $(MKDIR_P) $(top_builddir)/plugins/externaltools/data/)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]