[geany/geany] a1f2d0: waf: Don't use temp variables

Thomas Martitz git-noreply at xxxxx
Fri Apr 10 14:16:19 UTC 2015


Branch:      refs/heads/master
Author:      Thomas Martitz <kugel at rockbox.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 10 Apr 2015 14:16:19 UTC
Commit:      a1f2d0b94a8b49ce656f217afcc288fe49ff9aef
             https://github.com/geany/geany/commit/a1f2d0b94a8b49ce656f217afcc288fe49ff9aef

Log Message:
-----------
waf: Don't use temp variables


Modified Paths:
--------------
    wscript

Modified: wscript
7 lines changed, 2 insertions(+), 5 deletions(-)
===================================================================
@@ -489,9 +489,6 @@ def build(bld):
     base_uselibs = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'MAC_INTEGRATION', 'SUNOS_SOCKET', 'M']
 
     # libgeany
-    instpath = '${PREFIX}/bin' if is_win32 else '${LIBDIR}'
-    linkflags = bld.env['LINKFLAGS_cprogram']
-
     bld(
         features        = ['c', 'cxx', 'cshlib'],
         name            = 'geany',
@@ -501,9 +498,9 @@ def build(bld):
         defines         = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'],
         uselib          = base_uselibs,
         use             = ['scintilla', 'ctags', 'tagmanager', 'mio'],
-        linkflags       = linkflags,
+        linkflags       = bld.env['LINKFLAGS_cprogram'],
         vnum            = GEANY_LIB_VERSION,
-        install_path    = instpath)
+        install_path    = '${PREFIX}/bin' if is_win32 else '${LIBDIR}')
 
     # geany executable
     bld(



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


More information about the Commits mailing list