# HG changeset patch # User John W. Eaton # Date 1524246701 14400 # Node ID feadde11e10f15e5c19def215aa290bfae0c5f63 # Parent 3edbea625ba880756fa78b122e110c6adad27888 build-texinfo, texinfo: use "#! /usr/bin/env perl" in scripts texinfo: skip for native builds diff -r 3edbea625ba8 -r feadde11e10f src/build-texinfo.mk --- a/src/build-texinfo.mk Fri Apr 20 13:51:05 2018 -0400 +++ b/src/build-texinfo.mk Fri Apr 20 13:51:41 2018 -0400 @@ -26,6 +26,8 @@ $(MAKE) -C '$(1).build/util' -j '$(JOBS)' $(MAKE) -C '$(1).build/tp' -j '$(JOBS)' + $(SED) -i '1 s|^.*$$|#! /usr/bin/env perl|' '$(1).build/tp/texi2any' '$(1).build/util/txixml2texi' + $(MAKE) -C '$(1).build/gnulib/lib' -j 1 install DESTDIR='$(3)' $(MAKE) -C '$(1).build/util' -j 1 install DESTDIR='$(3)' $(MAKE) -C '$(1).build/tp' -j 1 install DESTDIR='$(3)' diff -r 3edbea625ba8 -r feadde11e10f src/texinfo.mk --- a/src/texinfo.mk Fri Apr 20 13:51:05 2018 -0400 +++ b/src/texinfo.mk Fri Apr 20 13:51:41 2018 -0400 @@ -20,7 +20,12 @@ echo $(texinfo_VERSION) endef -define $(PKG)_BUILD +ifeq ($(MXE_NATIVE_BUILD),yes) + ## We already have texinfo from the build-texinfo package. + define $(PKG)_BUILD + endef +else + define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ @@ -31,6 +36,9 @@ $(MAKE) -C '$(1).build/gnulib/lib' -j '$(JOBS)' $(MAKE) -C '$(1).build/util' -j '$(JOBS)' $(MAKE) -C '$(1).build/tp' -j '$(JOBS)' + + $(SED) -i '1 s|^.*$$|#! /usr/bin/env perl|' '$(1).build/tp/texi2any' '$(1).build/util/txixml2texi' + $(MAKE) -C '$(1).build/tp' -j 1 install DESTDIR='$(3)' $(MAKE) -C '$(1).build/util' -j 1 install DESTDIR='$(3)' @@ -46,4 +54,5 @@ $(MAKE) -C '$(1).build/info' -j '$(JOBS)' ginfo.exe; \ $(INSTALL) '$(1).build/info/ginfo.exe' '$(3)$(HOST_BINDIR)/info.exe'; \ fi -endef + endef +endif