diff options
| author | linimon <linimon@FreeBSD.org> | 2005-12-27 07:12:54 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2005-12-27 07:12:54 +0800 |
| commit | 2607f2b0e4a9a2142a8e342ea4b95fbd8d93e89b (patch) | |
| tree | 1bcb81e905e80a93e9b2c6be67777113bcc90890 /devel | |
| parent | 142c4a981b00220e601e53cd49f280b959bf8ce6 (diff) | |
| download | freebsd-ports-gnome-2607f2b0e4a9a2142a8e342ea4b95fbd8d93e89b.tar.gz freebsd-ports-gnome-2607f2b0e4a9a2142a8e342ea4b95fbd8d93e89b.tar.zst freebsd-ports-gnome-2607f2b0e4a9a2142a8e342ea4b95fbd8d93e89b.zip | |
Correct slight mis-merge. Should not affect anything.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/portmk/Mk/bsd.port.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/devel/portmk/Mk/bsd.port.mk b/devel/portmk/Mk/bsd.port.mk index 570cb2eca5ab..c1c676097299 100644 --- a/devel/portmk/Mk/bsd.port.mk +++ b/devel/portmk/Mk/bsd.port.mk @@ -1571,6 +1571,10 @@ CONFIGURE_ENV+= MAKE=${GMAKE} MAKE_ENV+= CC="${CC}" CXX="${CXX}" .endif +.if defined(USE_DOS2UNIX) +USE_REINPLACE= yes +.endif + .if defined(USE_LOCAL_MK) .if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) .include "${DEVELPORTSDIR}/Mk/bsd.local.mk" @@ -1580,10 +1584,6 @@ MAKE_ENV+= CC="${CC}" CXX="${CXX}" .endif .endif -.if defined(USE_DOS2UNIX) -USE_REINPLACE= yes -.endif - .if defined(USE_GCC) .if exists(${DEVELPORTSDIR}/Mk/bsd.gcc.mk) .include "${DEVELPORTSDIR}/Mk/bsd.gcc.mk" |