diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
| commit | 6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch) | |
| tree | 3b556699991305af672fba96e0e8b6bb88bcc7da /net/rsync/Makefile | |
| parent | 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff) | |
- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead
PR: 157936
Submitted by: myself
Exp-runs by: pav
Approved by: pav
Notes
Notes:
svn path=/head/; revision=282282
Diffstat (limited to 'net/rsync/Makefile')
| -rw-r--r-- | net/rsync/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 04b22c4b7d9c..d6f0302bf6f2 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -75,7 +75,7 @@ CFLAGS+= -I${LOCALBASE}/include USE_ICONV= yes CONFIGUREDCFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}" +CONFIGURE_ENV+= CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}" .else CONFIGURE_ARGS+= --disable-iconv CONFIGURE_ENV+= ac_cv_search_libiconv_open=no @@ -94,8 +94,8 @@ EXTRA_PATCHES+= ${WRKSRC}/patches/acls.diff .if defined(WITH_POPT_PORT) LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include .else CONFIGURE_ARGS+= --with-included-popt .endif |