[geany/geany-plugins] 0ffabe: Add installation prefix on Windows for icons

Enrico Tröger git-noreply at xxxxx
Fri Apr 11 18:13:38 UTC 2014


Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Fri, 11 Apr 2014 18:13:38 UTC
Commit:      0ffabe0d8c51179c0041d1e771fd62a4f12138c3
             https://github.com/geany/geany-plugins/commit/0ffabe0d8c51179c0041d1e771fd62a4f12138c3

Log Message:
-----------
Add installation prefix on Windows for icons

But then use the same path as on other systems, this fixes
broken plugin icons on Windows.


Modified Paths:
--------------
    gproject/wscript_build

Modified: gproject/wscript_build
6 files changed, 2 insertions(+), 4 deletions(-)
===================================================================
@@ -29,10 +29,8 @@ includes = ['gproject/src']
 build_plugin(bld, name, includes=includes)
 
 # Icons
-if target_is_win32(bld):
-    icon_dest = '${GEANYPLUGINS_DATADIR}/icons'
-else:
-    icon_dest = '${GEANYPLUGINS_DATADIR}/icons/hicolor/16x16/apps'
+prefix = '${G_PREFIX}/' if target_is_win32(bld) else ''
+icon_dest = '%s${GEANYPLUGINS_DATADIR}/icons/hicolor/16x16/apps' % prefix
 
 start_dir = bld.path.find_dir('icons')
 bld.install_files(icon_dest, start_dir.ant_glob('*.png'), cwd=start_dir)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Plugins-Commits mailing list