Mercurial > mxe-octave

diff Makefile.in @ 4192:438a4bfdc887

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new rules for creating a tarball from Octave's hg sources * hg-octave-dist.mk: New file. * Makefile.in: Include hg-octave-dist.mk. (ENV_PATH, ENV_PKG_CONFIG_PATH, ENV_LD_LIBRARY_PATH): Capture values from environment.
author John W. Eaton <jwe@octave.org>
date Mon, 29 Aug 2016 11:21:19 -0400
parents 4b0004dc5941
children 32814edc00db
line wrap: on
line diff
--- a/Makefile.in	Tue Aug 09 13:03:07 2016 +0900
+++ b/Makefile.in	Mon Aug 29 11:21:19 2016 -0400
@@ -250,8 +250,11 @@
 MAKEFILE   := $(TOP_BUILD_DIR)/Makefile
 PKGS       := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html'))
 
+ENV_PATH := $(PATH)
 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH)
 
+ENV_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
+
 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include'
 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
   CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64'
@@ -365,6 +368,8 @@
   MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll
 endif
 
+ENV_LD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
+
 ifeq ($(MXE_SYSTEM),mingw)
   MXE_WINDOWS_BUILD := yes
   ifneq ($(MXE_NATIVE_BUILD),yes)
@@ -881,3 +886,5 @@
 	$(TAR) czf $(distdir).tar.gz $(distdir)
 
 include $(TOP_DIR)/binary-dist-rules.mk
+
+include $(TOP_DIR)/hg-octave-dist.mk