Merge pull request #540 from kugel-/win32-plugindir

win32: change default plugin dir to match Linux.
geany · Jul 4, 2015 · a90b99b · a90b99b
2 parents aa40250 + 0b4228b
commit a90b99b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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