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 /x11/wdm | |
parent | 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff) | |
download | ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip |
- 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 'x11/wdm')
-rw-r--r-- | x11/wdm/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 96a757a35617..a18d2b2296b8 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -29,8 +29,7 @@ NOT_FOR_ARCHS= sparc64 USE_XORG= x11 xmu USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}" +CONFIGURE_ENV= DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}" CONFIGURE_ARGS= --with-logdir=/var/log \ --with-runlockdir=/var/run \ --with-wdmdir=${WDMDIR} \ @@ -45,8 +44,8 @@ CONFIGURE_ARGS= --with-logdir=/var/log \ MAN1= wdm.1 wdmLogin.1 -CPPFLAGS= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT -LDFLAGS= -L${LOCALBASE}/lib -lintl +CPPFLAGS+= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT +LDFLAGS+= -L${LOCALBASE}/lib -lintl DEF_SERVER?= ${LOCALBASE}/bin/X XRDB_PATH?= ${LOCALBASE}/bin/xrdb |