sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

win32: change default plugin dir to match Linux.

Browse Source 
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.
This commit is contained in:
Thomas Martitz 2015-06-27 23:49:20 +02:00
parent db30fdc6ec
commit 0b4228b94c
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geany.nsi
View File

@ -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

4
plugins/Makefile.am
View File

@ -3,11 +3,7 @@
EXTRA_DIST = \
makefile.win32
if MINGW
plugindir = $(libdir)
else
plugindir = $(libdir)/geany
endif
plugins_includedir = $(includedir)/geany
plugins_include_HEADERS = \

2
src/utils.c
View File

@ -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())

2
wscript
View File

@ -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