Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Sat, 12 Mar 2016 18:45:25 UTC Commit: c0e95ae275254025c4650f5e3c95f20c582f16ac https://github.com/geany/geany-plugins/commit/c0e95ae275254025c4650f5e3c95f2...

Log Message: ----------- Define PLUGIN{DATA,DOC,LIB}DIR more explicitly to try and make MSYS2 happy

Modified Paths: -------------- build/vars.build.mk

Modified: build/vars.build.mk 13 lines changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -6,7 +6,10 @@ LOCAL_AM_CFLAGS = \ -DGEANYPLUGINS_DATADIR=""share"" \ -DPKGDATADIR=""share/$(PACKAGE)"" \ -DLIBDIR=""lib"" \ - -DPKGLIBDIR=""lib/$(PACKAGE)"" + -DPKGLIBDIR=""lib/$(PACKAGE)"" \ + -DPLUGINDATADIR=""share/$(PACKAGE)/$(plugin)"" \ + -DPLUGINDOCDIR=""$(plugin)"" \ + -DPLUGINLIBDIR=""lib/$(PACKAGE)/$(plugin)"" else LOCAL_AM_CFLAGS = \ -DLOCALEDIR=""$(LOCALEDIR)"" \ @@ -15,15 +18,15 @@ LOCAL_AM_CFLAGS = \ -DGEANYPLUGINS_DATADIR=""$(datadir)"" \ -DPKGDATADIR=""$(pkgdatadir)"" \ -DLIBDIR=""$(libdir)"" \ - -DPKGLIBDIR=""$(pkglibdir)"" + -DPKGLIBDIR=""$(pkglibdir)"" \ + -DPLUGINDATADIR=""$(pkgdatadir)/$(plugin)"" \ + -DPLUGINDOCDIR=""$(docdir)/$(plugin)"" \ + -DPLUGINLIBDIR=""$(pkglibdir)/$(plugin)"" endif

AM_CFLAGS = \ ${LOCAL_AM_CFLAGS} \ -DPLUGIN=""$(plugin)"" \ - -DPLUGINDATADIR="PKGDATADIR"/"PLUGIN" \ - -DPLUGINDOCDIR="DOCDIR"/"PLUGIN" \ - -DPLUGINLIBDIR="PKGLIBDIR"/"PLUGIN" \ $(GEANY_CFLAGS) \ $(GP_CFLAGS)

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).