From ee324b25ffc5ae6fa3bfd2c87e8d70260cc87208 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 25 Jan 2017 14:12:59 -0200
Subject: [PATCH] Ajustes para empacotamento.

---
 Makefile.in                      | 25 +++----------------------
 locale/pw3270.pot                |  6 +++---
 src/plugins/dbus3270/Makefile.in |  2 +-
 src/pw3270/Makefile.in           |  7 -------
 4 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 63cc246..44277d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,12 +85,6 @@ $(BINDBG)/%@EXEEXT@: \
  
 	@$(MAKE) -C src/$(basename $(notdir $@)) $@
 
-$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \
-	$(DEPENDS) \
-	./src/pw3270/*
- 
-	@$(MAKE) -C src/pw3270 $@
-
 $(BINRLS)/%@DLLEXT@: \
 	$(DEPENDS) \
 	./src/%/*
@@ -151,25 +145,12 @@ $(BINRLS)/%@EXEEXT@: \
  
 	@$(MAKE) -C src/$(basename $(notdir $@)) $@
 
-$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \
-	$(DEPENDS) \
-	./src/pw3270/*
- 
-	@$(MAKE) -C src/pw3270 $@
-
-
-$(DESTDIR)$(BINRLS)/%@EXEEXT@: \
+$(DESTDIR)$(bindir)/%@EXEEXT@: \
 	$(DEPENDS) \
 	./src/%/*
  
 	@$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install
 
-$(DESTDIR)$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \
-	$(DEPENDS) \
-	./src/pw3270/*
- 
-	@$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install
-
 $(SRCDIR)/%: \
 	%/Makefile
 
@@ -225,7 +206,7 @@ install-lib: \
 	$(DESTDIR)$(libdir)/lib3270@DLLEXT@ \
 
 install-app: \
-	$(DESTDIR)$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
+	$(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)@EXEEXT@ \
 	locale/$(PACKAGE_TARNAME).pot
 
 	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
@@ -312,7 +293,7 @@ $(SRCDIR): \
 
 	@$(MKDIR) $(SRCDIR)/win
 	@$(INSTALL_DATA) \
-		win/*.in win/*.spec \
+		win/*.in \
 		$(SRCDIR)/win
 
 	@$(INSTALL_PROGRAM) \
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index c0f131d..ebf5818 100644
--- a/locale/pw3270.pot
+++ b/locale/pw3270.pot
@@ -9,7 +9,7 @@ msgstr ""
 "#-#-#-#-#  lib3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 17:53-0200\n"
+"POT-Creation-Date: 2017-01-25 11:42-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "#-#-#-#-#  pw3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 17:53-0200\n"
+"POT-Creation-Date: 2017-01-25 11:47-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,7 +42,7 @@ msgstr ""
 "#-#-#-#-#  dbus3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 17:53-0200\n"
+"POT-Creation-Date: 2017-01-25 11:42-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in
index 322bd43..517189a 100644
--- a/src/plugins/dbus3270/Makefile.in
+++ b/src/plugins/dbus3270/Makefile.in
@@ -135,7 +135,7 @@ $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(MODULE_NAME)@DLLEXT@: \
 
 	@echo $@ ...
 	@$(MKDIR) `dirname $@`
-	$(INSTALL_PROGRAM) $(BINRLS)/$(MODULE_NAME)@DLLEXT@ $@
+	@$(INSTALL_PROGRAM) $(BINRLS)/$(MODULE_NAME)@DLLEXT@ $@
 
 
 $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index 72720c4..84db20f 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -156,13 +156,6 @@ $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/%.png: \
 	@$(SVG2PNG) $< --format=png > $@
 	@$(OPTIPNG) -o7 $@
 
-$(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/%.png: \
-	%.png
-
-	@echo $< ...
-	@$(MKDIR) `dirname $@`
-	@$(OPTIPNG) -out $@ -o7 $<
-
 #---[ Release Targets ]------------------------------------------------------------------
 
 all: \
--
libgit2 0.21.2