diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-02 02:16:43 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-02 02:16:43 +0800 |
| commit | c6b5d20838eb8941b4243633bf3dc9f42894a1aa (patch) | |
| tree | 24b756ee6a58bf788c8619694b2a0b0bea25d6be | |
| parent | 87ea5d51dc73a1548c0b6379cbb7af46a75951b5 (diff) | |
| download | marcuscom-ports-c6b5d20838eb8941b4243633bf3dc9f42894a1aa.tar marcuscom-ports-c6b5d20838eb8941b4243633bf3dc9f42894a1aa.tar.gz marcuscom-ports-c6b5d20838eb8941b4243633bf3dc9f42894a1aa.tar.bz2 marcuscom-ports-c6b5d20838eb8941b4243633bf3dc9f42894a1aa.tar.lz marcuscom-ports-c6b5d20838eb8941b4243633bf3dc9f42894a1aa.tar.xz marcuscom-ports-c6b5d20838eb8941b4243633bf3dc9f42894a1aa.tar.zst marcuscom-ports-c6b5d20838eb8941b4243633bf3dc9f42894a1aa.zip | |
- Trick new versions of libtool into thinking vlc is installing in to ${PREFIX}
durring pre-install.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7465 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | multimedia/vlc-devel/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/vlc-devel/Makefile.inc | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 1473edc3b..03b03fdda 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -3,8 +3,8 @@ # Whom: Brian Somers <brian@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.19 2006/10/01 16:04:21 ahze Exp $ -# $Id: Makefile,v 1.20 2006-10-01 16:46:05 ahze Exp $ +# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.20 2006/10/01 16:46:05 ahze Exp $ +# $Id: Makefile,v 1.21 2006-10-01 18:16:43 ahze Exp $ # *** PLEASE READ Makefile.inc for more information on knobs *** # @@ -42,13 +42,13 @@ WANT_SDL= yes USE_ICONV= yes USE_PERL5_BUILD=yes -FAKEDIR= ${WRKDIR}/fake +FAKEDIR= ${WRKDIR}/fake/${PREFIX} PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS+= --enable-ffmpeg \ --with-ffmpeg=${LOCALBASE} \ diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc index 5549f9a12..c9c53a65b 100644 --- a/multimedia/vlc-devel/Makefile.inc +++ b/multimedia/vlc-devel/Makefile.inc @@ -5,8 +5,8 @@ # and will be autodetected to enable # # $FreeBSD$ -# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.5 2006/09/04 15:10:51 ahze Exp $ -# $Id: Makefile.inc,v 1.7 2006-10-01 16:04:21 ahze Exp $ +# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.7 2006/10/01 16:04:21 ahze Exp $ +# $Id: Makefile.inc,v 1.8 2006-10-01 18:16:43 ahze Exp $ # If you define for example WITH_FAAD and WITHOUT_FAAD # the WITHOUT_ will always over ride the WITH_. # @@ -286,7 +286,7 @@ pre-build: @${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \ ${WRKSRC}/vlc-config -pre-install: +pre-install: build ${RM} -rf ${PLIST} ${FAKEDIR} ${MKDIR} ${FAKEDIR} ${TOUCH} -f ${PLIST} |