diff options
| author | wiz <wiz@pkgsrc.org> | 2005-03-21 22:33:05 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-03-21 22:33:05 +0000 |
| commit | c4e778ff43255818b8cd463637f51c93a1910b25 (patch) | |
| tree | 76cc82bc164b8cb199bfb4b027750fb0c4193ba0 /pkgtools | |
| parent | 4141a285d51f796779e4b03baa8953b9b29de022 (diff) | |
| download | pkgsrc-c4e778ff43255818b8cd463637f51c93a1910b25.tar.gz | |
1.27: Do not add LIBTOOL_OVERRIDE to Makefiles by default -- the pkgsrc
default is usable for nearly all cases.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/url2pkg/files/url2pkg | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index a7bd8c6d3c7..9733ec9c546 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2004/11/05 17:38:51 tv Exp $ +# $NetBSD: Makefile,v 1.33 2005/03/21 22:33:05 wiz Exp $ # -DISTNAME= url2pkg-1.26 +DISTNAME= url2pkg-1.27 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg index 097931cc6f7..9d95f777709 100755 --- a/pkgtools/url2pkg/files/url2pkg +++ b/pkgtools/url2pkg/files/url2pkg @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: url2pkg,v 1.27 2004/11/05 17:38:51 tv Exp $ +# $NetBSD: url2pkg,v 1.28 2005/03/21 22:33:05 wiz Exp $ # # url2pkg # (c) 1999-2002 Hubert Feyrer <hubert@feyrer.de> @@ -138,7 +138,6 @@ libtool=\${WRKSRC}/libtool echo checking libtool: $ltconfig if [ -f $ltconfig -o -f $ltmain ]; then USE_LIBTOOL=yes - LIBTOOL_OVERRIDE=${libtool} fi PKGCONFIGS=`cd $wsrcdir && find * -name \*.pc.in -a ! -name \*-uninstalled.pc.in -type f` @@ -160,9 +159,6 @@ echo "Fixing up Makefile." if [ "${USE_LIBTOOL}" != "" ]; then echo "USE_LIBTOOL= $USE_LIBTOOL" fi - if [ "${LIBTOOL_OVERRIDE}" != "" ]; then - echo "LIBTOOL_OVERRIDE= $LIBTOOL_OVERRIDE" - fi for i in $PKGCONFIGS ; do echo "PKGCONFIG_OVERRIDE+= \${WRKSRC}/$i" |