diff options
| author | rh <rh@pkgsrc.org> | 2002-05-14 00:05:02 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2002-05-14 00:05:02 +0000 |
| commit | be8282119e61155a15efd234da7331bf157bb2b2 (patch) | |
| tree | 7a7a607333baaa8061a4ef0eefef6083b1968b0c /pkgtools | |
| parent | f4cf386602c9fff933c73df3f3302aec7ead4054 (diff) | |
| download | pkgsrc-be8282119e61155a15efd234da7331bf157bb2b2.tar.gz | |
Update url2pkg to 1.19. This adds some basic libtool-detection mechanism
that will set USE_LIBTOOL accordingly.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/url2pkg/files/url2pkg | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 809ea3425a7..9ebd33d5628 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2002/03/04 00:53:15 hubertf Exp $ +# $NetBSD: Makefile,v 1.19 2002/05/14 00:05:02 rh Exp $ # -DISTNAME= url2pkg-1.18 +DISTNAME= url2pkg-1.19 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg index 5520f870c42..ec79f69ca0a 100755 --- a/pkgtools/url2pkg/files/url2pkg +++ b/pkgtools/url2pkg/files/url2pkg @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: url2pkg,v 1.19 2002/03/04 00:53:16 hubertf Exp $ +# $NetBSD: url2pkg,v 1.20 2002/05/14 00:05:02 rh Exp $ # # url2pkg # (c) 1999-2002 Hubert Feyrer <hubert@feyrer.de> @@ -113,6 +113,15 @@ if [ -f $configure ]; then fi fi +ltconfig=`echo w*`/$wrksrc/ltconfig +ltmain=`echo w*`/$wrksrc/ltmain.sh +libtool=\${WRKSRC}/libtool +echo checking libtool: $ltconfig +if [ -f $ltconfig -o -f $ltmain ]; then + USE_LIBTOOL=YES + LIBTOOL_OVERRIDE=${libtool} +fi + echo "Fixing up Makefile." ( sed '/^.include/d' <Makefile @@ -121,6 +130,13 @@ echo "Fixing up Makefile." echo "WRKSRC= $WRKSRC" fi + if [ "${USE_LIBTOOL}" != "" ]; then + echo "USE_LIBTOOL= $USE_LIBTOOL" + fi + if [ "${LIBTOOL_OVERRIDE}" != "" ]; then + echo "LIBTOOL_OVERRIDE= $LIBTOOL_OVERRIDE" + fi + if [ "${HAS_CONFIGURE}" != "" ]; then echo "HAS_CONFIGURE= $HAS_CONFIGURE" fi |