diff options
| author | Christian Dywan <christian@twotoasts.de> | 2009-01-13 00:50:01 +0100 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2009-01-13 00:50:01 +0100 |
| commit | 05b5408a205b97aabffafb744d0c3d75874b3eee (patch) | |
| tree | 350688ec60cf18f11711eae8d5d86b952b7e3d3e /icons | |
| parent | 070670822e2dcb49fbc5c2dddd917bad34ea609a (diff) | |
| download | midori-05b5408a205b97aabffafb744d0c3d75874b3eee.tar.gz | |
Fix installing of data files
Diffstat (limited to 'icons')
| -rw-r--r-- | icons/wscript_build | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/icons/wscript_build b/icons/wscript_build index 05d22639..72a2326f 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -11,12 +11,6 @@ def add_image (bld, category, name): if not os.access (path, os.F_OK): os.mkdir (path) - def install_files (folder, destination, source): - try: - bld.install_files (folder, destination, source) - except: - pass - rsvg_convert = bld.env['RSVG_CONVERT'] if rsvg_convert: @@ -25,8 +19,8 @@ def add_image (bld, category, name): for size in [16, 22, 32, 48]: format = str (size) + 'x' + str (size) if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): - install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, - srcdir + '/icons/' + format + '/' + name + '.png') + bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category, + srcdir + '/icons/' + format + '/' + name + '.png') elif not rsvg_convert: pass elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK): @@ -36,8 +30,8 @@ def add_image (bld, category, name): ' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \ ' ' + srcdir + '/icons/scalable/' + name + '.svg' if not Utils.exec_command (command): - install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, - blddir + '/icons/' + format + '/' + name + '.png') + bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category, + blddir + '/icons/' + format + '/' + name + '.png') else: Utils.pprint ('BLUE', "Optimized icons could not be created.") break |