diff options
| author | Eitan Adler <eadler@FreeBSD.org> | 2013-11-23 06:43:14 +0000 |
|---|---|---|
| committer | Eitan Adler <eadler@FreeBSD.org> | 2013-11-23 06:43:14 +0000 |
| commit | ed175fb9971711c9db01ade0aba8ae9d26ebfa77 (patch) | |
| tree | d149220c6fcc9ae03bf5743321ba7dd1df68ecca /ports-mgmt | |
| parent | - Update to 0.8-12 (diff) | |
Move WITH_DEBUG check below b.p.m so it works with WITH_DEBUG_PORTS
Approved by: portmgr (bapt, maintainer)
Notes
Notes:
svn path=/head/; revision=334645
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 7 | ||||
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 2f84b3f5a2f5..0b3592bf07a6 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -23,9 +23,6 @@ USES= uidfix MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \ PORTREVISION=${PORTREVISION} -.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) -MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" -.endif # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir @@ -33,6 +30,10 @@ USE_SUBMAKE= yes .include <bsd.port.pre.mk> +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) +MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" +.endif + .if defined(WITH_PKGNG) .if ${WITH_PKGNG} != devel NO_LATEST_LINK= yes diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 375bb4b6f086..febd8db768fc 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -24,9 +24,6 @@ SHEBANG_FILES= scripts/completion/_pkg.bash.in MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \ PORTREVISION=${PORTREVISION} -.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) -MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" -.endif # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir @@ -34,6 +31,10 @@ USE_SUBMAKE= yes .include <bsd.port.pre.mk> +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) +MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" +.endif + .if defined(WITH_PKGNG) .if ${WITH_PKGNG} == devel NO_LATEST_LINK= yes |