From 4e5afd5041bf1fc77f3f6a39b483c87f3a7ddbea Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 15:16:40 +0200 Subject: [PATCH] Check for unistd.h in waf, update cache on (un)install only --- wscript | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/wscript b/wscript index 8783dcbb..6f4b9562 100644 --- a/wscript +++ b/wscript @@ -39,6 +39,8 @@ def configure (conf): conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) conf.check_pkg ('libsexy', destvar='LIBSEXY', vnum='0.1', mandatory=True) + conf.check_header ('unistd.h', 'HAVE_UNISTD_H') + if conf.find_program ('convert', var='CONVERT'): icons = 'yes' else: @@ -85,16 +87,17 @@ def build (bld): install_files ('DATADIR', 'applications', 'midori.desktop') def shutdown (): - dir = Common.path_install ('DATADIR', 'icons/hicolor') - icon_cache_updated = False - if not Params.g_options.destdir: - # update the pixmap cache directory - try: - subprocess.call (['gtk-update-icon-cache', '-q', '-f', '-t', dir]) - Params.pprint ('YELLOW', "Updated Gtk icon cache.") - icon_cache_updated = True - except: - Params.pprint ('RED', "Failed to update icon cache.") - if not icon_cache_updated: - Params.pprint ('YELLOW', "Icon cache not updated. After install, run this:") - Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) + if Params.g_commands['install'] or Params.g_commands['uninstall']: + dir = Common.path_install ('DATADIR', 'icons/hicolor') + icon_cache_updated = False + if not Params.g_options.destdir: + # update the pixmap cache directory + try: + subprocess.call (['gtk-update-icon-cache', '-q', '-f', '-t', dir]) + Params.pprint ('YELLOW', "Updated Gtk icon cache.") + icon_cache_updated = True + except: + Params.pprint ('RED', "Failed to update icon cache.") + if not icon_cache_updated: + Params.pprint ('YELLOW', "Icon cache not updated. After install, run this:") + Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir)