From 0b4228b94c6d647cb761f96ffd9f619bb38c4306 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Sat, 27 Jun 2015 23:49:20 +0200
Subject: [PATCH] win32: change default plugin dir to match Linux.

There is no need to do it differently as Linux here, and it confuses the
autotools based compilation of geany-plugins which installs to libdir/geany
unconditionally.
---
 geany.nsi           | 2 +-
 plugins/Makefile.am | 4 ----
 src/utils.c         | 2 +-
 wscript             | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/geany.nsi b/geany.nsi
index be1e4ed81..ce5b171b0 100644
--- a/geany.nsi
+++ b/geany.nsi
@@ -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
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 71603e67f..6daac80ab 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,11 +3,7 @@
 EXTRA_DIST = \
 	makefile.win32
 
-if MINGW
-plugindir = $(libdir)
-else
 plugindir = $(libdir)/geany
-endif
 
 plugins_includedir = $(includedir)/geany
 plugins_include_HEADERS = \
diff --git a/src/utils.c b/src/utils.c
index d1ec0dcc5..c5edd5a6c 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -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())
diff --git a/wscript b/wscript
index 44460c5dc..b1c07712a 100644
--- a/wscript
+++ b/wscript
@@ -397,7 +397,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
 
-- 
2.11.4.GIT