diff --git a/.github/workflows/winpkg.yml b/.github/workflows/winpkg.yml index 52c3a2e..111f628 100644 --- a/.github/workflows/winpkg.yml +++ b/.github/workflows/winpkg.yml @@ -40,7 +40,7 @@ jobs: - name: BuildApp run: ./win/ci-build.sh - name: Install pw3270 - run: make DESTDIR=./.build install + run: make DESTDIR=${PWD}/.build install - uses: robinraju/release-downloader@v1.7 with: repository: PerryWerneck/libipc3270 diff --git a/locale/Makefile.in b/locale/Makefile.in index 6cf11ac..86b0c86 100644 --- a/locale/Makefile.in +++ b/locale/Makefile.in @@ -78,9 +78,3 @@ all: \ install: \ $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) -# @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale -# @$(INSTALL_DATA) *.po $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale -# @$(INSTALL_DATA) $(PACKAGE_NAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale -# @$(INSTALL_DATA) Makefile $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale - - diff --git a/win/makeruntime.sh.in b/win/makeruntime.sh.in index 9ae2682..912ccb5 100755 --- a/win/makeruntime.sh.in +++ b/win/makeruntime.sh.in @@ -124,8 +124,6 @@ install_bin() { if [ -e ${prefix}/bin/${FILENAME} ]; then - echo "${prefix}/bin/${FILENAME}" - AGAIN=1 cp -v "${prefix}/bin/${FILENAME}" "${bindir}/${FILENAME}" if [ "$?" != "0" ]; then @@ -134,8 +132,6 @@ install_bin() { elif [ -e ${prefix}/lib/${FILENAME} ]; then - echo "${prefix}/lib/${FILENAME}" - AGAIN=1 cp -v "${prefix}/lib/${FILENAME}" "${bindir}/${FILENAME}" if [ "$?" != "0" ]; then @@ -165,5 +161,57 @@ install_bin() { } +install_locale() { + + + + mkdir -p ${buildroot}${prefix}/share/locale/pt_BR/LC_MESSAGES + + locales=" + gettext-runtime.mo + gettext-tools.mo + glib20.mo + gtk30.mo + gtk30-properties.mo + " + + for i in ${locales}; do + + find "${prefix}/share/locale" -name ${i} + + done + +} + +install_locale() { + + mkdir -p ${buildroot}${prefix}/share/locale/pt_BR/LC_MESSAGES + + locales=" + gettext-runtime.mo + gettext-tools.mo + glib20.mo + gtk30.mo + gtk30-properties.mo + " + + FILENAMES=$(mktemp) + for i in ${locales} + do + find "${prefix}/share/locale" -name ${i} >> ${FILENAMES} + done + + while read FILENAME + do + mkdir -p $(dirname "${buildroot}${FILENAME}") + cp -v "${FILENAME}" "${buildroot}${FILENAME}" + if [ "$?" != "0" ]; then + exit -1 + fi + done < ${FILENAMES} + rm -f ${FILENAMES} +} + install_bin +install_locale -- libgit2 0.21.2