Set docdir on Windows builds #376
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged
|
With eht16@6389d9e 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 |
| @@ -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') | |||
There was a problem hiding this comment.
this dosn't seem to match what DOCDIR is set to below, what's up with this?
There was a problem hiding this comment.
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 eht16@953d478.
|
Btw, I'd like to squash the commits before merging. |
|
Sure. LGBI now. |
eht16
force-pushed
the
extend_mingw_support
branch
from
953d478
to
02649ac
Compare
And remove unused define PKGLIBDIR and quote paths even.
eht16
force-pushed
the
extend_mingw_support
branch
from
02649ac
to
ebad47c
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
docdirthan inGP_CHECK_MINGW.