From 8eb32755848ccf02468c58fca77a6f40b86ab62b Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 16 Dec 2019 17:45:52 -0300
Subject: [PATCH] Fixing release build.

---
 Makefile.in                           |  3 +--
 src/objects/application/application.c | 10 +++++++++-
 src/objects/window/window.c           | 10 +++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1a93c9b..08447cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -196,8 +196,7 @@ all: \
 	$(POTDIR)/$(PACKAGE_NAME).pot
 
 Release: \
-	$(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \
-	$(BINRLS)/static/$(PACKAGE_NAME).a
+	$(BINRLS)/$(PACKAGE_NAME)@EXEEXT@
 
 $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@: \
 	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
diff --git a/src/objects/application/application.c b/src/objects/application/application.c
index f391c7e..7ad067d 100644
--- a/src/objects/application/application.c
+++ b/src/objects/application/application.c
@@ -263,7 +263,15 @@
 	//
 	// Setup application menus
 	//
-	GtkBuilder * builder = gtk_builder_new_from_file("ui/application.xml");
+	GtkBuilder * builder;
+#ifdef DEBUG
+	builder = gtk_builder_new_from_file("ui/application.xml");
+#else
+	{
+		lib3270_autoptr(char) build_file = lib3270_build_data_filename("ui","application.xml",NULL);
+		builder = gtk_builder_new_from_file(build_file);
+	}
+#endif // DEBUG
 
 	if(gtk_application_prefers_app_menu(GTK_APPLICATION(application)))
 		gtk_application_set_app_menu(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "app-menu")));
diff --git a/src/objects/window/window.c b/src/objects/window/window.c
index ca2d5c2..a929d8a 100644
--- a/src/objects/window/window.c
+++ b/src/objects/window/window.c
@@ -192,7 +192,15 @@
 
 	if(PW3270_IS_APPLICATION(gtk_window_get_application(GTK_WINDOW(window)))) {
 
-		GtkBuilder * builder = gtk_builder_new_from_file("ui/window.xml");
+		GtkBuilder * builder;
+#ifdef DEBUG
+		builder = gtk_builder_new_from_file("ui/window.xml");
+#else
+		{
+			lib3270_autoptr(char) build_file = lib3270_build_data_filename("ui","window.xml",NULL);
+			builder = gtk_builder_new_from_file(build_file);
+		}
+#endif // DEBUG
 
 		switch(pw3270_application_get_ui_style(G_APPLICATION(application))) {
 		case PW3270_UI_STYLE_CLASSICAL:
--
libgit2 0.21.2