Mercurial > mxe-octave

changeset 5883:f08c7cbb8df1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* build-gettext.mk: Undo recent changes; omit special msvc actions.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Sep 2021 10:21:56 -0400
parents 7bc0af5b2c9a
children 62eada485ce7
files src/build-gettext.mk
diffstat 1 files changed, 4 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/build-gettext.mk	Tue Sep 07 15:35:28 2021 -0400
+++ b/src/build-gettext.mk	Fri Sep 10 10:21:56 2021 -0400
@@ -18,27 +18,12 @@
 endef
 
 define $(PKG)_BUILD
-    mkdir '$(1)/gettext-runtime/.build'
-    cd    '$(1)/gettext-runtime/.build' && '$(1)/gettext-runtime/configure' \
+    mkdir '$(1).build'
+    cd    '$(1).build' && '$(1)/configure' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --without-libexpat-prefix \
         --without-libxml2-prefix \
 	$($(PKG)_CONFIGURE_OPTIONS)
-    $(MAKE) -C '$(1)/gettext-runtime/.build/intl' -j $(JOBS)
-    if test x$(MXE_SYSTEM) = xmsvc; then \
-        cd '$(1)/gettext-runtime/.build/intl' && $(CONFIGURE_POST_HOOK); \
-    fi
-    $(MAKE) -C '$(1)/gettext-runtime/.build/intl' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
-
-    mkdir '$(1)/gettext-tools/.build'
-    cd    '$(1)/gettext-tools/.build' && '$(1)/gettext-tools/configure' \
-        --prefix='$(BUILD_TOOLS_PREFIX)' \
-        --without-libexpat-prefix \
-        --without-libxml2-prefix \
-	$($(PKG)_CONFIGURE_OPTIONS)
-    $(MAKE) -C '$(1)/gettext-tools/.build/intl' -j $(JOBS)
-    if test x$(MXE_SYSTEM) = xmsvc; then \
-        cd '$(1)/gettext-tools/.build/intl' && $(CONFIGURE_POST_HOOK); \
-    fi
-    $(MAKE) -C '$(1)/gettext-tools/.build/intl' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
+    $(MAKE) -C '$(1).build' -j $(JOBS)
+    $(MAKE) -C '$(1).build' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
 endef