Commit 5c89f979205fbd2e8d8c0d901800818f241e532d
1 parent
eb2e23c8
Exists in
master
and in
5 other branches
Ajustes para corrigir empacotamento em red-hat
Showing
4 changed files
with
11 additions
and
12 deletions
Show diff stats
configure.ac
| ... | ... | @@ -156,7 +156,7 @@ case "$host" in |
| 156 | 156 | *) |
| 157 | 157 | DLLDIR="/lib" |
| 158 | 158 | DBG_LDFLAGS="-L.bin/Debug/$DLLDIR" |
| 159 | - RLS_LDFLAGS="-L.bin/Release/$DLLDIR" | |
| 159 | + RLS_LDFLAGS="-Wl,-rpath,\$(libdir)" | |
| 160 | 160 | LDARCH="" |
| 161 | 161 | LDSOFLAGS="-Wl,-soname,\`basename \$@\`" |
| 162 | 162 | LDAPPFLAGS="" |
| ... | ... | @@ -519,6 +519,8 @@ AC_SUBST(PLUGINS) |
| 519 | 519 | AC_SUBST(EXTENSIONS) |
| 520 | 520 | AC_SUBST(APP_GUI_SRC) |
| 521 | 521 | |
| 522 | +AC_SUBST(RLS_LDFLAGS) | |
| 523 | + | |
| 522 | 524 | #--[ Output files ]------------------------------------------------------------------------------------------------------------------------------------------- |
| 523 | 525 | |
| 524 | 526 | AC_CONFIG_FILES([ | ... | ... |
po/pt_BR.po
| ... | ... | @@ -5,8 +5,8 @@ msgid "" |
| 5 | 5 | msgstr "" |
| 6 | 6 | "Project-Id-Version: pw3270 5.0\n" |
| 7 | 7 | "Report-Msgid-Bugs-To: \n" |
| 8 | -"POT-Creation-Date: 2013-05-08 10:42-0300\n" | |
| 9 | -"PO-Revision-Date: 2013-04-23 10:22-0300\n" | |
| 8 | +"POT-Creation-Date: 2013-05-08 14:31-0300\n" | |
| 9 | +"PO-Revision-Date: 2013-05-08 14:30-0300\n" | |
| 10 | 10 | "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" |
| 11 | 11 | "Language-Team: Português <>\n" |
| 12 | 12 | "Language: pt_BR\n" |
| ... | ... | @@ -19,9 +19,9 @@ msgstr "" |
| 19 | 19 | "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" |
| 20 | 20 | |
| 21 | 21 | #: window.c:283 |
| 22 | -#, fuzzy, c-format | |
| 22 | +#, c-format | |
| 23 | 23 | msgid "%s - Disconnected" |
| 24 | -msgstr "_Desconectar" | |
| 24 | +msgstr "%s - Desconectado" | |
| 25 | 25 | |
| 26 | 26 | #: actions.c:742 actions.c:754 |
| 27 | 27 | #, c-format | ... | ... |
src/lib3270/Makefile.in
| ... | ... | @@ -169,15 +169,12 @@ version.c: ./mkversion.sh |
| 169 | 169 | @chmod +x ./mkversion.sh |
| 170 | 170 | @./mkversion.sh |
| 171 | 171 | |
| 172 | -fallbacks.c: $(BINDIR)/mkfb@EXEEXT@ X3270.xad | |
| 172 | +fallbacks.c: X3270.xad mkfb.c | |
| 173 | 173 | @echo " GEN $@" |
| 174 | + @$(MKDIR) $(BINDIR) | |
| 175 | + @$(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ mkfb.c | |
| 174 | 176 | @$(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@ |
| 175 | 177 | |
| 176 | -$(BINDIR)/mkfb@EXEEXT@: mkfb.c Makefile | |
| 177 | - @echo " CCLD `basename $@`" | |
| 178 | - @$(MKDIR) `dirname $@` | |
| 179 | - @$(HOST_CC) -g -o $@ mkfb.c | |
| 180 | - | |
| 181 | 178 | clean: |
| 182 | 179 | @rm -fr .obj |
| 183 | 180 | @rm -fr .bin | ... | ... |
src/pw3270/Makefile.in
| ... | ... | @@ -137,7 +137,7 @@ $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_ |
| 137 | 137 | $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) |
| 138 | 138 | @echo " CCLD `basename $@`" |
| 139 | 139 | @$(MKDIR) `dirname $@` |
| 140 | - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) | |
| 140 | + @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) | |
| 141 | 141 | @$(STRIP) $@ |
| 142 | 142 | |
| 143 | 143 | #---[ Debug targets ]---------------------------------------------------------- | ... | ... |