[geany/geany] a90b99: Merge pull request #540 from kugel-/win32-plugindir

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sat, 04 Jul 2015 10:29:22 UTC
Commit:      a90b99b968be529c59d0f371975c8be0bfbfa258
             https://github.com/geany/geany/commit/a90b99b968be529c59d0f371975c8be0bfbfa258

Log Message:
-----------
Merge pull request #540 from kugel-/win32-plugindir

win32: change default plugin dir to match Linux.


Modified Paths:
--------------
    geany.nsi
    plugins/Makefile.am
    src/utils.c
    wscript

Modified: geany.nsi
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -168,7 +168,7 @@ Section "Plugins" SEC02
 	SectionIn 1
 	SetOverwrite ifnewer
 	SetOutPath "$INSTDIR\lib"
-	File "${RESOURCEDIR}\lib\*.dll"
+	File "${RESOURCEDIR}\lib\geany\*.dll"
 SectionEnd
 
 Section "Language Files" SEC03


Modified: plugins/Makefile.am
4 lines changed, 0 insertions(+), 4 deletions(-)
===================================================================
@@ -3,11 +3,7 @@
 EXTRA_DIST = \
 	makefile.win32
 
-if MINGW
-plugindir = $(libdir)
-else
 plugindir = $(libdir)/geany
-endif
 
 plugins_includedir = $(includedir)/geany
 plugins_include_HEADERS = \


Modified: src/utils.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2121,7 +2121,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type)
 		resdirs[RESOURCE_DIR_ICON] = g_build_filename(prefix, "share", "icons", NULL);
 		resdirs[RESOURCE_DIR_DOC] = g_build_filename(prefix, "doc", NULL);
 		resdirs[RESOURCE_DIR_LOCALE] = g_build_filename(prefix, "share", "locale", NULL);
-		resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", NULL);
+		resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", "geany", NULL);
 		g_free(prefix);
 #else
 		if (is_osx_bundle())


Modified: wscript
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -401,7 +401,7 @@ def build(bld):
 
     def build_plugin(plugin_name, install=True, uselib_add=[]):
         if install:
-            instpath = '${PREFIX}/lib' if is_win32 else '${LIBDIR}/geany'
+            instpath = '${LIBDIR}/geany'
         else:
             instpath = None
 



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