[geany/geany-plugins] 77722e: Merge pull request #267 from kugel-/build-fixes

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Tue, 07 Jul 2015 16:02:14 UTC
Commit:      77722e9f15b9022cb2084d0de0a24a7ea4984232
             https://github.com/geany/geany-plugins/commit/77722e9f15b9022cb2084d0de0a24a7ea4984232

Log Message:
-----------
Merge pull request #267 from kugel-/build-fixes

Windows build fixes


Modified Paths:
--------------
    build/vars.build.mk
    build/wafutils.py

Modified: build/vars.build.mk
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -9,7 +9,7 @@ AM_CFLAGS = \
 	$(GEANY_CFLAGS) \
 	$(GP_CFLAGS)
 
-AM_LDFLAGS = -module -avoid-version $(GP_LDFLAGS)
+AM_LDFLAGS = -module -avoid-version -no-undefined $(GP_LDFLAGS)
 
 COMMONLIBS = \
 	$(GEANY_LIBS) \


Modified: build/wafutils.py
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -122,7 +122,7 @@ def build_plugin(ctx, name, plugin_name=None, sources=None, includes=None, defin
         defines       = defines,
         target        = plugin_name,
         use           = libraries,
-        install_path  = '${G_PREFIX}/${LIBDIR}' if is_win32 else '${LIBDIR}/geany/')
+        install_path  = '${G_PREFIX}/${LIBDIR}/geany/' if is_win32 else '${LIBDIR}/geany/')
 
     install_docs(ctx, plugin_name, 'AUTHORS ChangeLog COPYING NEWS README THANKS TODO'.split())
     return task



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