From 3b0d97b0de8516db29699676c860489da3f7f0e1 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 20 Jun 2008 01:09:05 +0000 Subject: Add DESTDIR support. --- converters/autoconvert/Makefile | 7 ++++--- converters/autoconvert/distinfo | 6 +++--- converters/autoconvert/patches/patch-aa | 8 ++++---- converters/autoconvert/patches/patch-ab | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) (limited to 'converters/autoconvert') diff --git a/converters/autoconvert/Makefile b/converters/autoconvert/Makefile index 61d711f7b8b..141bfba8c9f 100644 --- a/converters/autoconvert/Makefile +++ b/converters/autoconvert/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2008/02/28 11:58:47 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:09 joerg Exp $ DISTNAME= autoconvert-0.3.13 PKGREVISION= 2 @@ -13,10 +13,11 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake AUTO_MKDIRS= yes +INSTALLATION_DIRS= share/examples/autoconvert + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/autoconvert ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${WRKSRC}/shed.* \ - ${PREFIX}/share/examples/autoconvert + ${DESTDIR}${PREFIX}/share/examples/autoconvert .include "../../devel/libgetopt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/autoconvert/distinfo b/converters/autoconvert/distinfo index be66d19db88..484aa061b52 100644 --- a/converters/autoconvert/distinfo +++ b/converters/autoconvert/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2007/09/29 12:35:11 rillig Exp $ +$NetBSD: distinfo,v 1.5 2008/06/20 01:09:09 joerg Exp $ SHA1 (autoconvert-0.3.13.tar.gz) = cc59899e46ccfaacdb39f7a73767780b721ab75d RMD160 (autoconvert-0.3.13.tar.gz) = b429b82f6aa4086edd745baf18d5f8ba48821d23 Size (autoconvert-0.3.13.tar.gz) = 464081 bytes -SHA1 (patch-aa) = 803666f4de76422dec546dc56c643abeda43edb1 -SHA1 (patch-ab) = f2dc6af133d620e67e414b7f0f1543e47ef794db +SHA1 (patch-aa) = c1ac76a219628504c801fff41898b233ffc30811 +SHA1 (patch-ab) = 1aaaccddbec49455b4c1e8fa79d2f401460c4e4a SHA1 (patch-ac) = f39bf83874feea530883383acd0c37658bf6d454 SHA1 (patch-ad) = 7f5fda124a2bf24d972830adc9694322d27317c8 diff --git a/converters/autoconvert/patches/patch-aa b/converters/autoconvert/patches/patch-aa index d505c7a71c4..eb8d532d643 100644 --- a/converters/autoconvert/patches/patch-aa +++ b/converters/autoconvert/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/19 09:25:25 agc Exp $ +$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:09 joerg Exp $ --- Makefile.orig Sat Apr 28 09:45:46 2001 +++ Makefile @@ -44,6 +44,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/19 09:25:25 agc Exp $ - install -m 644 include/*.h $(DESTDIR)/usr/include - ln -s autogb $(DESTDIR)/usr/bin/autob5 + cd hzconvert;$(MAKE) install -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) autogb $(PREFIX)/bin -+ $(BSD_INSTALL_DATA) include/*.h $(PREFIX)/include -+ ln -fs $(PREFIX)/bin/autogb $(PREFIX)/bin/autob5 ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) autogb ${DESTDIR}$(PREFIX)/bin ++ $(BSD_INSTALL_DATA) include/*.h ${DESTDIR}$(PREFIX)/include ++ ln -fs autogb ${DESTDIR}$(PREFIX)/bin/autob5 diff --git a/converters/autoconvert/patches/patch-ab b/converters/autoconvert/patches/patch-ab index 68590a83ee1..aa4835c3561 100644 --- a/converters/autoconvert/patches/patch-ab +++ b/converters/autoconvert/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/06/19 09:25:25 agc Exp $ +$NetBSD: patch-ab,v 1.2 2008/06/20 01:09:09 joerg Exp $ --- hzconvert/Makefile.orig Mon Jan 8 18:03:21 2001 +++ hzconvert/Makefile @@ -30,7 +30,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/06/19 09:25:25 agc Exp $ + $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(PREFIX)/lib + +install: all -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(PREFIX)/lib ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) ${DESTDIR}$(PREFIX)/lib clean: rm -f *.o *~ ../lib/lib* -- cgit v1.2.3