summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2010-11-24 07:38:33 (GMT)
committerTony Theodore <tonyt@logyst.com>2010-11-24 07:38:33 (GMT)
commit7ddc7133cb25deb253c726d27c89ba9ca27df5dc (patch)
tree48be6a5f4087bf6eeb90ac5deb11513fba38f99b
parent46a8124829fbfc7ed9ce0253c4d6f0224e5cfcde (diff)
downloadmxe-7ddc7133cb25deb253c726d27c89ba9ca27df5dc.zip
mxe-7ddc7133cb25deb253c726d27c89ba9ca27df5dc.tar.gz
mxe-7ddc7133cb25deb253c726d27c89ba9ca27df5dc.tar.bz2
add portability variable for libtool
-rw-r--r--Makefile7
-rw-r--r--doc/index.html1
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9fb8bb5..4bfe4c9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,16 @@ TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE)))
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
diff --git a/doc/index.html b/doc/index.html
index 55881c6..6747818 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1018,6 +1018,7 @@ https://...</pre>
<table class="translation">
<tr><td><code>bash</code></td> <td>&rarr;</td><td><code>$(SHELL)</code></td></tr>
<tr><td><code>install</code></td> <td>&rarr;</td><td><code>$(INSTALL)</code></td></tr>
+ <tr><td><code>libtool</code></td> <td>&rarr;</td><td><code>$(LIBTOOL)</code></td></tr>
<tr><td><code>libtoolize</code></td><td>&rarr;</td><td><code>$(LIBTOOLIZE)</code></td></tr>
<tr><td><code>make</code></td> <td>&rarr;</td><td><code>$(MAKE)</code></td></tr>
<tr><td><code>patch</code></td> <td>&rarr;</td><td><code>$(PATCH)</code></td></tr>