From 7ddc7133cb25deb253c726d27c89ba9ca27df5dc Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 24 Nov 2010 18:38:33 +1100 Subject: [PATCH] add portability variable for libtool --- Makefile | 7 ++++--- doc/index.html | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9fb8bb59..4bfe4c97 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,^.*\([^<]*\).*$$,\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 55881c68..67478187 100644 --- a/doc/index.html +++ b/doc/index.html @@ -1018,6 +1018,7 @@ https://... +
bash →$(SHELL)
install →$(INSTALL)
libtool →$(LIBTOOL)
libtoolize→$(LIBTOOLIZE)
make →$(MAKE)
patch →$(PATCH)