Branch: refs/heads/master Author: Thomas Martitz kugel@rockbox.org Committer: Thomas Martitz kugel@rockbox.org Date: Wed, 01 Jul 2015 21:41:37 UTC Commit: 0b4228b94c6d647cb761f96ffd9f619bb38c4306 https://github.com/geany/geany/commit/0b4228b94c6d647cb761f96ffd9f619bb38c43...
Log Message: ----------- 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.
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(-) =================================================================== @@ -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
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).