Commit 6fdbb70388bd26a41d594ae0b4ae4fa6218766d3
1 parent
3a930db7
Exists in
master
and in
5 other branches
Corrigindo empacotamento no Ubuntu
Showing
7 changed files
with
13 additions
and
13 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -262,12 +262,12 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist |
| 262 | 262 | |
| 263 | 263 | install: install-sdk install-lib install-app install-man |
| 264 | 264 | |
| 265 | -install-app: install-locale | |
| 265 | +install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale | |
| 266 | 266 | @$(MAKE) DESTDIR=$(DESTDIR) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install |
| 267 | 267 | @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui |
| 268 | 268 | @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui |
| 269 | 269 | |
| 270 | -install-lib: | |
| 270 | +install-lib: $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ | |
| 271 | 271 | @$(MAKE) DESTDIR=$(DESTDIR) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install |
| 272 | 272 | |
| 273 | 273 | locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) | ... | ... |
po/pt_BR.po
| ... | ... | @@ -5,7 +5,7 @@ msgid "" |
| 5 | 5 | msgstr "" |
| 6 | 6 | "Project-Id-Version: pw3270 5.0\n" |
| 7 | 7 | "Report-Msgid-Bugs-To: \n" |
| 8 | -"POT-Creation-Date: 2012-09-13 13:47-0300\n" | |
| 8 | +"POT-Creation-Date: 2012-09-13 15:45-0300\n" | |
| 9 | 9 | "PO-Revision-Date: 2012-09-05 09:05-0300\n" |
| 10 | 10 | "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" |
| 11 | 11 | "Language-Team: Português do Brasil <>\n" | ... | ... |
src/lib3270/Makefile.in
| ... | ... | @@ -55,8 +55,8 @@ LD=@CC@ |
| 55 | 55 | HOST_CC=@HOST_CC@ |
| 56 | 56 | STRIP=@STRIP@ |
| 57 | 57 | INSTALL=@INSTALL@ |
| 58 | -INSTALL_PROGRAM=@INSTALL_PROGRAM@ | |
| 59 | -INSTALL_DATA=@INSTALL_DATA@ | |
| 58 | +INSTALL_PROGRAM=$(INSTALL) -m 755 | |
| 59 | +INSTALL_DATA=$(INSTALL) -m 644 | |
| 60 | 60 | VALGRIND=@VALGRIND@ |
| 61 | 61 | XGETTEXT=@XGETTEXT@ |
| 62 | 62 | MSGCAT=@MSGCAT@ | ... | ... |
src/lib3270/rpq.c
| ... | ... | @@ -746,7 +746,7 @@ static void rpq_dump_warnings(H3270 *hSession) |
| 746 | 746 | /* If there's something to complain about, only complain once. */ |
| 747 | 747 | if (!hSession->rpq_complained && hSession->rpq_wbcnt) |
| 748 | 748 | { |
| 749 | - popup_an_error(hSession,hSession->rpq_warnbuf); | |
| 749 | + popup_an_error(hSession,"%s",hSession->rpq_warnbuf); | |
| 750 | 750 | hSession->rpq_wbcnt = 0; |
| 751 | 751 | hSession->rpq_complained = 1; |
| 752 | 752 | ... | ... |
src/lib3270/session.c
| ... | ... | @@ -145,9 +145,9 @@ static void message(H3270 *session, LIB3270_NOTIFY id , const char *title, const |
| 145 | 145 | __android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",msg); |
| 146 | 146 | __android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",text); |
| 147 | 147 | #else |
| 148 | - lib3270_write_log(session,"%s",title); | |
| 149 | - lib3270_write_log(session,"%s",msg); | |
| 150 | - lib3270_write_log(session,"%s",text); | |
| 148 | + lib3270_write_log(session,"lib3270","%s",title); | |
| 149 | + lib3270_write_log(session,"lib3270","%s",msg); | |
| 150 | + lib3270_write_log(session,"lib3270","%s",text); | |
| 151 | 151 | #endif // ANDROID |
| 152 | 152 | } |
| 153 | 153 | ... | ... |
src/lib3270/telnet.c
| ... | ... | @@ -616,7 +616,7 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo |
| 616 | 616 | { |
| 617 | 617 | if (resolve_host_and_port(session,session->proxy_host, session->proxy_portname,&session->proxy_port, &haddr.sa, &ha_len, errmsg,sizeof(errmsg)) < 0) |
| 618 | 618 | { |
| 619 | - popup_an_error(session,errmsg); | |
| 619 | + popup_an_error(session,"%s",errmsg); | |
| 620 | 620 | return -1; |
| 621 | 621 | } |
| 622 | 622 | } |
| ... | ... | @@ -624,7 +624,7 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo |
| 624 | 624 | { |
| 625 | 625 | if (resolve_host_and_port(session,host, portname,&session->current_port, &haddr.sa, &ha_len,errmsg, sizeof(errmsg)) < 0) |
| 626 | 626 | { |
| 627 | - popup_an_error(session,errmsg); | |
| 627 | + popup_an_error(session,"%s",errmsg); | |
| 628 | 628 | return -1; |
| 629 | 629 | } |
| 630 | 630 | } | ... | ... |
src/pw3270/Makefile.in
| ... | ... | @@ -42,8 +42,8 @@ DEBDIR ?= debian |
| 42 | 42 | EXEEXT=@EXEEXT@ |
| 43 | 43 | STRIP=@STRIP@ |
| 44 | 44 | INSTALL=@INSTALL@ |
| 45 | -INSTALL_PROGRAM=@INSTALL_PROGRAM@ | |
| 46 | -INSTALL_DATA=@INSTALL_DATA@ | |
| 45 | +INSTALL_PROGRAM=$(INSTALL) -m 755 | |
| 46 | +INSTALL_DATA=$(INSTALL) -m 644 | |
| 47 | 47 | CONVERT=@CONVERT@ |
| 48 | 48 | LN_S=@LN_S@ |
| 49 | 49 | ... | ... |