# HG changeset patch # User Volker Grabsch # Date 1265550935 -3600 # Node ID 93f1be1d208929ba27e2899c050796f7d35afd95 # Parent af58a2ee9a699d3210470ed0440571744b6b8855 use glibtoolize instead of libtoolize where appropriate (by Tony Theodore) diff -r af58a2ee9a69 -r 93f1be1d2089 Makefile --- 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,^.*\([^<]*\).*$$,\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,^.*\([^<]*\).*$$,\1,p' '$(TOP_DIR)/doc/index.html') # unset any environment variables which might cause trouble AR = diff -r af58a2ee9a69 -r 93f1be1d2089 src/vmime.mk --- 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)' \