$OpenBSD: patch-Makefile_in,v 1.4 2008/12/27 15:33:04 sturm Exp $ --- Makefile.in.orig Tue May 24 14:09:35 2005 +++ Makefile.in Thu Dec 25 10:31:01 2008 @@ -7,6 +7,8 @@ CPP = @CPP@ APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@ APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@ +MT?= + srcdir = @srcdir@ VPATH = @srcdir@ @@ -14,11 +16,12 @@ INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APR APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@ APRUTIL_LIBS = @APRUTIL_LIBS@ -TARGET_LIB = lib@APRUTIL_LIBNAME@.la +TARGET_LIB = lib@APRUTIL_LIBNAME@${MT}.la INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@ EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@ -APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc +APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION)${MT}.pc APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config +APU_INSTCONFIG = apu-$(APRUTIL_MAJOR_VERSION)${MT}-config INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -59,13 +62,13 @@ install: $(TARGET_LIB) apu-config.out for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \ $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \ done - $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE) + $(INSTALL_DATA) apr-util${MT}.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE) list='$(INSTALL_SUBDIRS)'; for i in $$list; do \ ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \ done $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir) $(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir) - $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG) + $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_INSTCONFIG) $(TARGET_LIB): $(OBJECTS) $(LINK) @lib_target@ $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)