[banshee] build.rules.mk: use -hook instead of -local
- From: Aaron Bockover <abock src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] build.rules.mk: use -hook instead of -local
- Date: Thu, 8 Jul 2010 01:25:29 +0000 (UTC)
commit f5e2239a5221f310c0f8dd1365e3b1ed8dc442d0
Author: Aaron Bockover <abockover novell com>
Date: Wed Jul 7 19:32:13 2010 -0400
build.rules.mk: use -hook instead of -local
install-data-hook and uninstall-hook run after all automake-generated
installation targets. Execution order of the -local targets is not
guaranteed. This can be problematic when installing icons or mime types
where tools like 'update-mime-database' must be run after installation.
Also support executing EXTRA_INSTALL_DATA_HOOK and EXTRA_UNINSTALL_HOOK
variables in the hook targets.
build/build.rules.mk | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 434994e..621d62c 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -77,11 +77,13 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
theme-icons: $(THEME_ICONS_SOURCE)
@$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
-install-data-local: $(THEME_ICONS_SOURCE)
+install-data-hook: $(THEME_ICONS_SOURCE)
@$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
-
-uninstall-local: $(THEME_ICONS_SOURCE)
+ $(EXTRA_INSTALL_DATA_HOOK)
+
+uninstall-hook: $(THEME_ICONS_SOURCE)
@$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+ $(EXTRA_UNINSTALL_HOOK)
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]