From 61154d957e03af56bd7e10f107ac7bef4d24aebe Mon Sep 17 00:00:00 2001
From: David Macek <david.macek.0@gmail.com>
Date: Thu, 19 Feb 2015 13:44:06 +0100
Subject: [PATCH 2/2] Fix plugin compilation

---
 plugins/Makefile.am | 2 +-
 src/Makefile.am     | 2 +-
 src/utils.c         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils.c b/src/utils.c
index 36c6e7e..09a063b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2098,7 +2098,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type)
 #ifdef G_OS_WIN32
 		gchar *prefix = win32_get_installation_dir();
 
-		resdirs[RESOURCE_DIR_DATA] = g_build_filename(prefix, "data", NULL);
+		resdirs[RESOURCE_DIR_DATA] = g_build_filename(prefix, "share", "geany", NULL);
 		resdirs[RESOURCE_DIR_ICON] = g_build_filename(prefix, "share", "icons", NULL);
 		resdirs[RESOURCE_DIR_DOC] = g_build_filename(prefix, "share", "doc", "geany", "html", NULL);
 		resdirs[RESOURCE_DIR_LOCALE] = g_build_filename(prefix, "share", "locale", NULL);
--- a/configure.ac	2016-11-13 16:44:30.000000000 +0100
+++ b/configure.ac	2017-02-15 21:26:19.648276600 +0100
@@ -115,7 +115,7 @@
 
 # double eval since datarootdir is usually defined as ${prefix}/share
 AM_COND_IF([MINGW],
-  [pkgdatadir='${prefix}/data'],
+  [pkgdatadir='${datarootdir}/geany'],
   [pkgdatadir='${datarootdir}/geany'])
 AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))])
 AC_SUBST([pkgdatadir])
--- a/src/Makefile.am	2016-11-13 16:44:30.000000000 +0100
+++ b/src/Makefile.am	2017-02-15 22:15:10.265165500 +0100
@@ -135,7 +135,7 @@
 # build Geany for Windows (possibly on non-Windows systems -- cross-compile)
 
 AM_CPPFLAGS += \
-	-DGEANY_DATADIR=\"data\" \
+	-DGEANY_DATADIR=\"\" \
 	-DGEANY_DOCDIR=\"\" \
 	-DGEANY_LIBDIR=\"\" \
 	-DGEANY_LIBEXECDIR=\"\" \
--- a/plugins/Makefile.am	2016-11-13 16:44:30.000000000 +0100
+++ b/plugins/Makefile.am	2017-02-15 22:16:36.834162400 +0100
@@ -65,7 +65,7 @@
 
 if MINGW
 # FIXME: why is this define different than the non-MINGW one?
-AM_CPPFLAGS = -DGEANY_DATADIR=\"data\"
+AM_CPPFLAGS = -DGEANY_DATADIR=\"\"
 else
 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\"
 endif
--- a/Makefile.am	2016-11-13 16:44:30.000000000 +0100
+++ b/Makefile.am	2017-02-15 22:34:43.339065000 +0100
@@ -41,15 +41,6 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2
-if MINGW
-	$(INSTALL_DATA) $(srcdir)/AUTHORS $(DESTDIR)$(prefix)/Authors.txt
-	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(prefix)/Changelog.txt
-	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(prefix)/Copying.txt
-	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(prefix)/Readme.txt
-	$(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(prefix)/News.txt
-	$(INSTALL_DATA) $(srcdir)/THANKS $(DESTDIR)$(prefix)/Thanks.txt
-	$(INSTALL_DATA) $(srcdir)/TODO $(DESTDIR)$(prefix)/Todo.txt
-endif
 
 dist-hook:
 	@if test -d "$(top_srcdir)/.git"; then \
-- 
2.11.1.windows.1

