changeset 704:93f1be1d2089

use glibtoolize instead of libtoolize where appropriate (by Tony Theodore)
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 07 Feb 2010 14:55:35 +0100
parents af58a2ee9a69
children c951876aa54f 0a976e6b82e3
files Makefile src/vmime.mk
diffstat 2 files changed, 15 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Feb 07 13:53:53 2010 +0100
+++ b/Makefile	Sun Feb 07 14:55:35 2010 +0100
@@ -5,19 +5,20 @@
 TARGET             := i686-pc-mingw32
 SOURCEFORGE_MIRROR := kent.dl.sourceforge.net
 
-PREFIX    := $(PWD)/usr
-LOG_DIR   := $(PWD)/log
-TIMESTAMP := $(shell date +%Y%m%d_%H%M%S)
-PKG_DIR   := $(PWD)/pkg
-DIST_DIR  := $(PWD)/dist
-TMP_DIR    = $(PWD)/tmp-$(1)
-MAKEFILE  := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-TOP_DIR   := $(patsubst %/,%,$(dir $(MAKEFILE)))
-PATH      := $(PREFIX)/bin:$(PATH)
-SHELL     := bash
-SED       := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
-INSTALL   := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
-VERSION   := $(shell $(SED) -n 's,^.*<span id="latest-version">\([^<]*\)</span>.*$$,\1,p' '$(TOP_DIR)/doc/index.html')
+PREFIX     := $(PWD)/usr
+LOG_DIR    := $(PWD)/log
+TIMESTAMP  := $(shell date +%Y%m%d_%H%M%S)
+PKG_DIR    := $(PWD)/pkg
+DIST_DIR   := $(PWD)/dist
+TMP_DIR     = $(PWD)/tmp-$(1)
+MAKEFILE   := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+TOP_DIR    := $(patsubst %/,%,$(dir $(MAKEFILE)))
+PATH       := $(PREFIX)/bin:$(PATH)
+SHELL      := bash
+SED        := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
+INSTALL    := $(shell ginstall --help >/dev/null 2>&1 && echo g)install
+LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize
+VERSION    := $(shell $(SED) -n 's,^.*<span id="latest-version">\([^<]*\)</span>.*$$,\1,p' '$(TOP_DIR)/doc/index.html')
 
 # unset any environment variables which might cause trouble
 AR =
--- a/src/vmime.mk	Sun Feb 07 13:53:53 2010 +0100
+++ b/src/vmime.mk	Sun Feb 07 14:55:35 2010 +0100
@@ -19,6 +19,7 @@
 endef
 
 define $(PKG)_BUILD
+    $(SED) 's,libtoolize ,$(LIBTOOLIZE) ,' -i '$(1)'/bootstrap
     cd '$(1)' && ./bootstrap
     cd '$(1)' && ./configure \
       --prefix='$(PREFIX)/$(TARGET)' \