|
 |
8f91ed |
From cff568ca9ac94a0564f0751090fde3cde41a3f11 Mon Sep 17 00:00:00 2001
|
|
|
8f91ed |
From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
|
|
|
8f91ed |
Date: Sun, 12 Jul 2015 11:16:04 +0200
|
|
|
8f91ed |
Subject: [PATCH 19/26] build: fix generation of desktop files for external
|
|
|
8f91ed |
tools
|
|
|
8f91ed |
|
|
|
8f91ed |
The .desktop files were not generated since there were two rules for the
|
|
|
8f91ed |
same targets. So the last rule was executed, which is the mkdir command.
|
|
|
8f91ed |
|
|
|
8f91ed |
To be sure that the mkdir command is executed before any target is
|
|
|
8f91ed |
built, we can use $(shell ...). See:
|
|
|
8f91ed |
http://stackoverflow.com/questions/2122602/force-makefile-to-execute-script-before-building-targets
|
|
|
8f91ed |
---
|
|
|
8f91ed |
plugins/externaltools/data/Makefile.am | 3 +--
|
|
|
8f91ed |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
8f91ed |
|
|
|
8f91ed |
diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am
|
|
|
8f91ed |
index e3a4707..23098be 100644
|
|
|
8f91ed |
--- a/plugins/externaltools/data/Makefile.am
|
|
|
8f91ed |
+++ b/plugins/externaltools/data/Makefile.am
|
|
|
8f91ed |
@@ -59,5 +59,4 @@ CLEANFILES += \
|
|
|
8f91ed |
# generating the .desktop files.
|
|
|
8f91ed |
# If the following bug is fixed, this hack can normally be removed:
|
|
|
8f91ed |
# https://bugs.launchpad.net/intltool/+bug/605826
|
|
|
8f91ed |
-$(externaltools_all_desktop_files):
|
|
|
8f91ed |
- $(AM_V_GEN) $(MKDIR_P) $(top_builddir)/plugins/externaltools/data/
|
|
|
8f91ed |
+$(shell $(MKDIR_P) $(top_builddir)/plugins/externaltools/data/)
|
|
|
8f91ed |
--
|
|
|
8f91ed |
1.8.3.1
|
|
|
8f91ed |
|