From bcbb02626b91957014e06cc1acf54294a3ef4613 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 2 Sep 2019 17:46:52 -0300
Subject: [PATCH] Adjustments for windows packaging.

---
 configure.ac         | 21 +++++++++++++++++++++
 src/core/Makefile.in | 14 +++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index b11939a..20edb1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,27 @@ AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
 AC_SUBST(INTL_LIBS)
 
 dnl ---------------------------------------------------------------------------
+dnl Environment
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_VAR(GACROOT, [ The root for gacutil (default is /usr/lib) ] )
+
+if test -z "$GACROOT"; then
+	GACROOT="/usr/lib"
+fi
+
+AC_SUBST(GACROOT)
+
+
+AC_ARG_VAR(GAPIROOT, [ The root for gapi (default is /usr/share/gapi-2.0) ] )
+
+if test -z "$GAPIROOT"; then
+	GAPIROOT="/usr/share/gapi-2.0"
+fi
+
+AC_SUBST(GAPIROOT)
+
+dnl ---------------------------------------------------------------------------
 dnl Check for IPC3270
 dnl ---------------------------------------------------------------------------
 
diff --git a/src/core/Makefile.in b/src/core/Makefile.in
index 2965a4e..143160c 100644
--- a/src/core/Makefile.in
+++ b/src/core/Makefile.in
@@ -74,16 +74,16 @@ Release: \
 install: \
 	$(BINRLS)/$(LIBNAME)
 
-	@$(GACUTIL) -i $(BINRLS)/$(LIBNAME) -root $(DESTDIR)/usr/lib
+	$(GACUTIL) -i $(BINRLS)/$(LIBNAME) -root $(DESTDIR)@GACROOT@
 
-	@$(MKDIR) $(DESTDIR)/usr/share/gapi-2.0/$(MODULE_NAME)
-	@$(INSTALL_DATA) $(BINRLS)/$(MODULE_NAME).xml $(DESTDIR)/usr/share/gapi-2.0/$(MODULE_NAME)
+	$(MKDIR) $(DESTDIR)@GAPIROOT@/$(MODULE_NAME)
+	$(INSTALL_DATA) $(BINRLS)/$(MODULE_NAME).xml $(DESTDIR)@GAPIROOT@/$(MODULE_NAME)
 
-	@$(MKDIR) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
-	@$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
+	$(MKDIR) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
+	$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
 
-	@$(MKDIR) $(DESTDIR)/$(libdir)/pkgconfig
-	@$(INSTALL_DATA) $(MODULE_NAME).pc $(DESTDIR)/$(libdir)/pkgconfig
+	$(MKDIR) $(DESTDIR)/$(libdir)/pkgconfig
+	$(INSTALL_DATA) $(MODULE_NAME).pc $(DESTDIR)/$(libdir)/pkgconfig
 
 Debug: \
 	$(BINDBG)/$(LIBNAME)
--
libgit2 0.21.2