And remove unused define PKGLIBDIR and quote paths even.
As continuation of #374 after more testing on Windows. These should be last bits regarding Waf->Autotools migration for G-P on Windows, so I hope.
As we all know, I'm not an Autotools expert: maybe there is a better way/location to overwrite `docdir` than in `GP_CHECK_MINGW`. You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany-plugins/pull/376
-- Commit Summary --
* Set docdir on Windows builds
-- File Changes --
M build/common.m4 (3) M build/vars.build.mk (12)
-- Patch Links --
https://github.com/geany/geany-plugins/pull/376.patch https://github.com/geany/geany-plugins/pull/376.diff
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376
With https://github.com/eht16/geany-plugins/commit/6389d9e834d1f09f5090859ed06017... I'm now done with my changes. G-P build fine and installer works properly.
There is still an issue with some plugins not being able to open their local help files in `DOCDIR` but this need to be fixed in the affected plugins.
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376#issuecomment-192928131
@@ -75,6 +75,7 @@ AC_DEFUN([GP_CHECK_MINGW], *mingw*) AC_DEFINE([WIN32], [1], [we are cross compiling for WIN32]) AM_CONDITIONAL([MINGW], true)
AC_SUBST([docdir], '${prefix}/doc/geany-plugins')
this dosn't seem to match what `DOCDIR` is set to below, what's up with this?
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376/files#r55587434
@@ -14,15 +13,14 @@ LOCAL_AM_CFLAGS = \ -DDOCDIR=""$(docdir)"" \ -DGEANYPLUGINS_DATADIR=""$(datadir)"" \ -DPKGDATADIR=""$(pkgdatadir)"" \
- -DLIBDIR=""$(libdir)"" \
- -DPKGLIBDIR=""$(pkglibdir)""
ok, not used for the moment. FWIW, would be `"lib/$(PACKAGE)"` on Windows I guess -- or simply `"lib"` as it's already likely to be package-specific
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376/files#r55587685
@@ -75,6 +75,7 @@ AC_DEFUN([GP_CHECK_MINGW], *mingw*) AC_DEFINE([WIN32], [1], [we are cross compiling for WIN32]) AM_CONDITIONAL([MINGW], true)
AC_SUBST([docdir], '${prefix}/doc/geany-plugins')
Oops, this was just a left-over in this PR. I actually built the provided test binaries without this. Thanks for noticing it and sorry. Fixed in https://github.com/eht16/geany-plugins/commit/953d478f2cbb1b06d730e421b6673b....
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376/files#r55633642
@@ -14,15 +13,14 @@ LOCAL_AM_CFLAGS = \ -DDOCDIR=""$(docdir)"" \ -DGEANYPLUGINS_DATADIR=""$(datadir)"" \ -DPKGDATADIR=""$(pkgdatadir)"" \
- -DLIBDIR=""$(libdir)"" \
- -DPKGLIBDIR=""$(pkglibdir)""
I have no idea what it would be on Windows as I also don't know what it might be used for on non-Windows. Do we want to keep it? I couldn't find any reference to it.
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376/files#r55633860
Btw, I'd like to squash the commits before merging.
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376#issuecomment-194663892
@@ -14,15 +13,14 @@ LOCAL_AM_CFLAGS = \ -DDOCDIR=""$(docdir)"" \ -DGEANYPLUGINS_DATADIR=""$(datadir)"" \ -DPKGDATADIR=""$(pkgdatadir)"" \
- -DLIBDIR=""$(libdir)"" \
- -DPKGLIBDIR=""$(pkglibdir)""
`pkglibdir` is `$(libdir)/$(PACKAGE)`.
And well, it's a common thing to have but yeah as it's not used I guess we can remove it.
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376/files#r55634835
Sure. LGBI now.
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376#issuecomment-194672160
@@ -14,15 +13,14 @@ LOCAL_AM_CFLAGS = \ -DDOCDIR=""$(docdir)"" \ -DGEANYPLUGINS_DATADIR=""$(datadir)"" \ -DPKGDATADIR=""$(pkgdatadir)"" \
- -DLIBDIR=""$(libdir)"" \
- -DPKGLIBDIR=""$(pkglibdir)""
Ok, even if not used, I changed my mind and re-added PKGLIBDIR, leave it untouched for non-Windows and set it to "lib/geany-plugins" on Windows. Not sure if this is the correct path, we will see once it is used. Then it is least there and visible.
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376/files#r55922405
Merged #376.
--- Reply to this email directly or view it on GitHub: https://github.com/geany/geany-plugins/pull/376#event-587606793
github-comments@lists.geany.org