Download as
Browse Code »

Commit 6c431023eceadb7192f2d5a676a47844fd4385a0

Authored by Perry Werneck
1 parent ec6845c6
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing windows translation files location.

Showing 4 changed files with 15 additions and 15 deletions   Show diff stats
Makefile.in
  Diff comments   View file @6c43102
... ... @@ -31,6 +31,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
31 31 PACKAGE_LEVEL=@PACKAGE_LEVEL@
32 32 PACKAGE_TARNAME=@PACKAGE_TARNAME@
33 33 PACKAGE_DESCRIPTION=@PACKAGE_DESCRIPTION@
  34 +PRODUCT_NAME=@PRODUCT_NAME@
34 35  
35 36 #---[ Paths ]------------------------------------------------------------------
36 37  
... ... @@ -45,7 +46,6 @@ docdir=@docdir@
45 46 sysconfdir=@sysconfdir@
46 47 mandir=@mandir@
47 48 APPDATADIR=@APPDATADIR@
48   -datadir=$(datarootdir)/@PRODUCT_NAME@
49 49  
50 50 BASEDIR=@BASEDIR@
51 51  
... ... @@ -175,11 +175,11 @@ $(POTDIR)/%.pot: \
175 175 @$(MAKE) -C src/$(basename $(notdir $@)) $@
176 176  
177 177 $(POTDIR)/%.pot: \
178   - @LIBRARY_POT_FILES@/%.pot
  178 + $(datarootdir)/$(PRODUCT_NAME)/pot/%.pot
179 179  
180 180 @echo $(notdir $@) ...
181 181 @mkdir -p `dirname $@`
182   - @cp "$^" $@
  182 + @cp "$^" "$@"
183 183  
184 184 $(POTDIR)/%.pot: \
185 185 ./modules/%/* \
... ...
configure.ac
  Diff comments   View file @6c43102
... ... @@ -105,9 +105,6 @@ AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
105 105  
106 106 AC_ARG_WITH([source-locales], [AS_HELP_STRING([--with-source-locales], [Set path for lib3270 locale sources])], [ app_cv_source_locales="$withval" ],[ app_cv_source_locales="/usr/share/`pkg-config --variable=product_name lib3270`/pot" ])
107 107  
108   -AC_DEFINE_UNQUOTED(LIBRARY_POT_FILES, $app_cv_source_locales)
109   -AC_SUBST(LIBRARY_POT_FILES,$app_cv_source_locales)
110   -
111 108 AC_ARG_WITH([application-datadir], [AS_HELP_STRING([--with-application-datadir], [Set path for configuration file])], [ app_cv_source_appdatadir="$withval" ],[ app_cv_source_appdatadir="\$(datarootdir)/`pkg-config --variable=product_name lib3270`" ])
112 109  
113 110 AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
... ...
locale/pw3270.pot
  Diff comments   View file @6c43102
... ... @@ -9,7 +9,7 @@ msgstr ""
9 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2019-09-05 13:27-0300\n"
  12 +"POT-Creation-Date: 2019-09-06 10:59-0300\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 &quot;&quot;
20 20 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 21 "Project-Id-Version: PACKAGE VERSION\n"
22 22 "Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2019-09-05 13:21+0000\n"
  23 +"POT-Creation-Date: 2019-09-05 19:36+0000\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"
... ... @@ -31,7 +31,7 @@ msgstr &quot;&quot;
31 31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
32 32 "Project-Id-Version: PACKAGE VERSION\n"
33 33 "Report-Msgid-Bugs-To: \n"
34   -"POT-Creation-Date: 2019-09-05 13:52+0000\n"
  34 +"POT-Creation-Date: 2019-09-05 19:38+0000\n"
35 35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36 36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37 37 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
win/pack.sh
  Diff comments   View file @6c43102
... ... @@ -494,7 +494,7 @@ do
494 494 value=${tmp##*=}
495 495  
496 496 case "$parameter" in
497   - NOPUBLISH)
  497 + NO-NOPUBLISH)
498 498 PUBLISH=0
499 499 ;;
500 500  
... ... @@ -502,7 +502,7 @@ do
502 502 PUBLISH=1
503 503 ;;
504 504  
505   - PRODUCT)
  505 + PRODUCT-NAME)
506 506 PRODUCT_NAME=${value}
507 507 ;;
508 508  
... ... @@ -518,7 +518,7 @@ do
518 518  
519 519 ;;
520 520  
521   - PROJECT-DIR)
  521 + PROJECT-PATH)
522 522 PROJECTDIR=$(readlink -f ${value})
523 523 ;;
524 524  
... ... @@ -529,14 +529,17 @@ do
529 529 echo "Options:"
530 530 echo ""
531 531  
  532 + echo " --product-name Set the product name (current is ${PRODUCT_NAME})"
  533 + echo " --project-path Set the path for the customization data"
  534 +
532 535 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
533   - echo " --nopublish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
534   - echo " --publish Publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
  536 + echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
  537 + echo " --publish Publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
535 538 fi
536 539  
537 540  
538 541 if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
539   - echo " --clear Remove ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
  542 + echo " --clear Remove ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
540 543 fi
541 544  
542 545 echo ""
... ...