Commit ee324b25ffc5ae6fa3bfd2c87e8d70260cc87208
1 parent
a1bebb17
Exists in
master
and in
5 other branches
Ajustes para empacotamento.
Showing
4 changed files
with
7 additions
and
33 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -85,12 +85,6 @@ $(BINDBG)/%@EXEEXT@: \ |
| 85 | 85 | |
| 86 | 86 | @$(MAKE) -C src/$(basename $(notdir $@)) $@ |
| 87 | 87 | |
| 88 | -$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \ | |
| 89 | - $(DEPENDS) \ | |
| 90 | - ./src/pw3270/* | |
| 91 | - | |
| 92 | - @$(MAKE) -C src/pw3270 $@ | |
| 93 | - | |
| 94 | 88 | $(BINRLS)/%@DLLEXT@: \ |
| 95 | 89 | $(DEPENDS) \ |
| 96 | 90 | ./src/%/* |
| ... | ... | @@ -151,25 +145,12 @@ $(BINRLS)/%@EXEEXT@: \ |
| 151 | 145 | |
| 152 | 146 | @$(MAKE) -C src/$(basename $(notdir $@)) $@ |
| 153 | 147 | |
| 154 | -$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \ | |
| 155 | - $(DEPENDS) \ | |
| 156 | - ./src/pw3270/* | |
| 157 | - | |
| 158 | - @$(MAKE) -C src/pw3270 $@ | |
| 159 | - | |
| 160 | - | |
| 161 | -$(DESTDIR)$(BINRLS)/%@EXEEXT@: \ | |
| 148 | +$(DESTDIR)$(bindir)/%@EXEEXT@: \ | |
| 162 | 149 | $(DEPENDS) \ |
| 163 | 150 | ./src/%/* |
| 164 | 151 | |
| 165 | 152 | @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install |
| 166 | 153 | |
| 167 | -$(DESTDIR)$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \ | |
| 168 | - $(DEPENDS) \ | |
| 169 | - ./src/pw3270/* | |
| 170 | - | |
| 171 | - @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install | |
| 172 | - | |
| 173 | 154 | $(SRCDIR)/%: \ |
| 174 | 155 | %/Makefile |
| 175 | 156 | |
| ... | ... | @@ -225,7 +206,7 @@ install-lib: \ |
| 225 | 206 | $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \ |
| 226 | 207 | |
| 227 | 208 | install-app: \ |
| 228 | - $(DESTDIR)$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ | |
| 209 | + $(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)@EXEEXT@ \ | |
| 229 | 210 | locale/$(PACKAGE_TARNAME).pot |
| 230 | 211 | |
| 231 | 212 | @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) |
| ... | ... | @@ -312,7 +293,7 @@ $(SRCDIR): \ |
| 312 | 293 | |
| 313 | 294 | @$(MKDIR) $(SRCDIR)/win |
| 314 | 295 | @$(INSTALL_DATA) \ |
| 315 | - win/*.in win/*.spec \ | |
| 296 | + win/*.in \ | |
| 316 | 297 | $(SRCDIR)/win |
| 317 | 298 | |
| 318 | 299 | @$(INSTALL_PROGRAM) \ | ... | ... |
locale/pw3270.pot
| ... | ... | @@ -9,7 +9,7 @@ msgstr "" |
| 9 | 9 | "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" |
| 10 | 10 | "Project-Id-Version: PACKAGE VERSION\n" |
| 11 | 11 | "Report-Msgid-Bugs-To: \n" |
| 12 | -"POT-Creation-Date: 2017-01-24 17:53-0200\n" | |
| 12 | +"POT-Creation-Date: 2017-01-25 11:42-0200\n" | |
| 13 | 13 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 14 | 14 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 15 | 15 | "Language-Team: LANGUAGE <LL@li.org>\n" |
| ... | ... | @@ -20,7 +20,7 @@ msgstr "" |
| 20 | 20 | "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" |
| 21 | 21 | "Project-Id-Version: PACKAGE VERSION\n" |
| 22 | 22 | "Report-Msgid-Bugs-To: \n" |
| 23 | -"POT-Creation-Date: 2017-01-24 17:53-0200\n" | |
| 23 | +"POT-Creation-Date: 2017-01-25 11:47-0200\n" | |
| 24 | 24 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 25 | 25 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 26 | 26 | "Language-Team: LANGUAGE <LL@li.org>\n" |
| ... | ... | @@ -42,7 +42,7 @@ msgstr "" |
| 42 | 42 | "#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n" |
| 43 | 43 | "Project-Id-Version: PACKAGE VERSION\n" |
| 44 | 44 | "Report-Msgid-Bugs-To: \n" |
| 45 | -"POT-Creation-Date: 2017-01-24 17:53-0200\n" | |
| 45 | +"POT-Creation-Date: 2017-01-25 11:42-0200\n" | |
| 46 | 46 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 47 | 47 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 48 | 48 | "Language-Team: LANGUAGE <LL@li.org>\n" | ... | ... |
src/plugins/dbus3270/Makefile.in
| ... | ... | @@ -135,7 +135,7 @@ $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(MODULE_NAME)@DLLEXT@: \ |
| 135 | 135 | |
| 136 | 136 | @echo $@ ... |
| 137 | 137 | @$(MKDIR) `dirname $@` |
| 138 | - $(INSTALL_PROGRAM) $(BINRLS)/$(MODULE_NAME)@DLLEXT@ $@ | |
| 138 | + @$(INSTALL_PROGRAM) $(BINRLS)/$(MODULE_NAME)@DLLEXT@ $@ | |
| 139 | 139 | |
| 140 | 140 | |
| 141 | 141 | $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ | ... | ... |
src/pw3270/Makefile.in
| ... | ... | @@ -156,13 +156,6 @@ $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/%.png: \ |
| 156 | 156 | @$(SVG2PNG) $< --format=png > $@ |
| 157 | 157 | @$(OPTIPNG) -o7 $@ |
| 158 | 158 | |
| 159 | -$(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/%.png: \ | |
| 160 | - %.png | |
| 161 | - | |
| 162 | - @echo $< ... | |
| 163 | - @$(MKDIR) `dirname $@` | |
| 164 | - @$(OPTIPNG) -out $@ -o7 $< | |
| 165 | - | |
| 166 | 159 | #---[ Release Targets ]------------------------------------------------------------------ |
| 167 | 160 | |
| 168 | 161 | all: \ | ... | ... |