From b95c0682b0b39ddc6ac9c889ded9df3ff7cdbfca Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 5 Jun 2014 15:00:01 -0400 Subject: [PATCH] js/Makefile.am: Fix dependency generation with srcdir != builddir If reusing an existing separate builddir, the generation of dependencies for the JS resource file would fail because it couldn't find misc/config.js, resulting in the resource file not being regenerated. https://bugzilla.gnome.org/show_bug.cgi?id=732348 --- js/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/Makefile.am b/js/Makefile.am index 09ceab16b..6d9b85b08 100644 --- a/js/Makefile.am +++ b/js/Makefile.am @@ -13,7 +13,7 @@ misc/config.js: misc/config.js.in Makefile -e "s|[@]sysconfdir@|$(sysconfdir)|g" \ $< > $@ -js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/js-resources.gresource.xml) +js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate-dependencies $(srcdir)/js-resources.gresource.xml) js-resources.h: js-resources.gresource.xml $(js_resource_files) misc/config.js $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $< js-resources.c: js-resources.gresource.xml $(js_resource_files) misc/config.js