diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-09-01 17:32:03 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-09-12 19:24:59 +0200 |
| commit | b4cb198b9710531e0a4ccf5d3f835427daeecaad (patch) | |
| tree | ff2a71a3aeb9de4f2c79af3ac6672496f9367ee6 | |
| parent | da07989b17cbdd4f12576e8ac982c4f7d8540d7b (diff) | |
| download | buildroot-novena-b4cb198b9710531e0a4ccf5d3f835427daeecaad.tar.gz buildroot-novena-b4cb198b9710531e0a4ccf5d3f835427daeecaad.zip | |
shared-mime-info: convert old-style hook to new-style hook
We don't want to use 'make DESTDIR=$(TARGET_DIR) install' as we only
want the MIME database to be installed on the target. So we simply
override the target installation command.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/shared-mime-info/shared-mime-info.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk index 487d4b232..6abfa7531 100644 --- a/package/shared-mime-info/shared-mime-info.mk +++ b/package/shared-mime-info/shared-mime-info.mk @@ -8,7 +8,7 @@ SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.bz2 SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess SHARED_MIME_INFO_INSTALL_STAGING = YES -SHARED_MIME_INFO_INSTALL_TARGET = NO +SHARED_MIME_INFO_INSTALL_TARGET = YES SHARED_MIME_INFO_AUTORECONF = NO SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint @@ -21,14 +21,13 @@ HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool HOST_SHARED_MIME_INFO_CONF_OPT = \ --disable-update-mimedb +define SHARED_MIME_INFO_INSTALL_TARGET_CMDS + $(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime + $(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache +endef + $(eval $(call AUTOTARGETS,package,shared-mime-info)) $(eval $(call AUTOTARGETS,package,shared-mime-info,host)) # shared-mime-info for the host SHARED_MIME_INFO_HOST_BINARY:=$(HOST_DIR)/usr/bin/update-mime-database - -# update the shared-mime-info database in the target -$(SHARED_MIME_INFO_HOOK_POST_INSTALL): - $(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime - $(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache - touch $@ |