Mercurial > mxe-octave
changeset 1413:b14677f6af57
add portability variable for libtool
author | Tony Theodore <tonyt@logyst.com> |
---|---|
date | Wed, 24 Nov 2010 18:38:33 +1100 |
parents | c1fe01427369 |
children | 3e767a565122 |
files | Makefile doc/index.html |
diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Nov 22 09:04:57 2010 +0100 +++ b/Makefile Wed Nov 24 18:38:33 2010 +1100 @@ -16,15 +16,16 @@ PATH := $(PREFIX)/bin:$(PATH) SHELL := bash INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install +LIBTOOL := $(shell glibtool --help >/dev/null 2>&1 && echo g)libtool LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed VERSION := $(shell $(SED) -n 's,^.*<span id="latest-version">\([^<]*\)</span>.*$$,\1,p' '$(TOP_DIR)/doc/index.html') REQUIREMENTS := autoconf automake bash bison bzip2 cmake flex \ - gcc intltoolize $(LIBTOOLIZE) $(MAKE) openssl \ - $(PATCH) $(PERL) pkg-config scons $(SED) unzip \ - wget xz yasm + gcc intltoolize $(LIBTOOL) $(LIBTOOLIZE) \ + $(MAKE) openssl $(PATCH) $(PERL) pkg-config \ + scons $(SED) unzip wget xz yasm # unexport any environment variables that might cause trouble unexport AR CC CFLAGS C_INCLUDE_PATH CPATH CPLUS_INCLUDE_PATH CPP
--- a/doc/index.html Mon Nov 22 09:04:57 2010 +0100 +++ b/doc/index.html Wed Nov 24 18:38:33 2010 +1100 @@ -1018,6 +1018,7 @@ <table class="translation"> <tr><td><code>bash</code></td> <td>→</td><td><code>$(SHELL)</code></td></tr> <tr><td><code>install</code></td> <td>→</td><td><code>$(INSTALL)</code></td></tr> + <tr><td><code>libtool</code></td> <td>→</td><td><code>$(LIBTOOL)</code></td></tr> <tr><td><code>libtoolize</code></td><td>→</td><td><code>$(LIBTOOLIZE)</code></td></tr> <tr><td><code>make</code></td> <td>→</td><td><code>$(MAKE)</code></td></tr> <tr><td><code>patch</code></td> <td>→</td><td><code>$(PATCH)</code></td></tr>