diff options
author | jlam <jlam@pkgsrc.org> | 2006-07-07 15:49:30 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2006-07-07 15:49:30 +0000 |
commit | ee68c933149fd6d0813f9a1fa090c26d8ecee0d2 (patch) | |
tree | 5278cb82e97bb3d8e2ae6a66b9d26fa073e4d665 /multimedia | |
parent | fb353ac0e30d02a5ef548b478fc62e3f48760493 (diff) | |
download | pkgsrc-ee68c933149fd6d0813f9a1fa090c26d8ecee0d2.tar.gz |
LIBTOOL_OVERRIDE generally doesn't need to be specified anymore... just
set OVERRIDE_DIRDEPTH to find any libtool scripts deeper in the WRKSRC
tree unless they're named something other than "libtool".
SHLIBTOOL_OVERRIDE generally doesn't need to be specified either -- just
define it to the empty list and shlibtool-override will look for libtool
scripts.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/kmplayer/Makefile | 4 | ||||
-rw-r--r-- | multimedia/libassetml/Makefile | 3 | ||||
-rw-r--r-- | multimedia/mjpegtools/Makefile | 4 | ||||
-rw-r--r-- | multimedia/mpeg4ip/Makefile | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index e8de8372b4c..bf4e5d79f31 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/06/13 12:16:36 markd Exp $ +# $NetBSD: Makefile,v 1.33 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= kmplayer-0.9.2a @@ -21,7 +21,7 @@ USE_LIBTOOL= yes CONFIGURE_ARGS+= --without-gstreamer -SHLIBTOOL_OVERRIDE= libtool +SHLIBTOOL_OVERRIDE= # empty SUBST_CLASSES+= desktop SUBST_MESSAGE.desktop= Fixing application launcher. diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile index 41d9927c3b4..bc7c45df1b9 100644 --- a/multimedia/libassetml/Makefile +++ b/multimedia/libassetml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/06/11 14:29:03 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/07/07 15:49:33 jlam Exp $ # DISTNAME= libassetml-1.2.1 @@ -14,7 +14,6 @@ USE_DIRS+= gnome2-1.5 # share/gnome/help USE_TOOLS+= gmake pkg-config texi2html msgfmt USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/src/libassetml.pc.in GNU_CONFIGURE= yes INFO_FILES= # PLIST diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index e4483d314ba..d7803332880 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/06/12 16:28:12 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2006/07/07 15:49:33 jlam Exp $ DISTNAME= mjpegtools-1.8.0 PKGREVISION= 5 @@ -19,7 +19,7 @@ USE_TOOLS+= bash:run pkg-config USE_LANGUAGES= c c++ USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE+= libtool +SHLIBTOOL_OVERRIDE= # empty PKGCONFIG_OVERRIDE= mjpegtools.pc.in INFO_FILES= # PLIST diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 75c6838fd69..9cdcb5445ca 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/06/12 16:28:12 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2006/07/07 15:49:33 jlam Exp $ DISTNAME= mpeg4ip-1.5 PKGREVISION= 2 @@ -16,7 +16,7 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= bootstrap -LIBTOOL_OVERRIDE= libtool */libtool */*/libtool */*/*/libtool +OVERRIDE_DIRDEPTH= 3 # */*/*/libtool .include "../../devel/SDL/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" |