diff options
| -rw-r--r-- | Mk/bsd.kde.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 8714a06bf0da..44535e213fdc 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -117,11 +117,6 @@ QTCPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include \ -I${QT_PREFIX}/include -D_GETOPT_H QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg \ -L${QT_PREFIX}/lib -.if defined(PACKAGE_BUILDING) -TMPDIR?= /tmp -MAKE_ENV+= TMPDIR="${TMPDIR}" -CONFIGURE_ENV+= TMPDIR="${TMPDIR}" -.endif .if !defined(QT_NONSTANDARD) CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 9540f4008545..8e64eac9b5e4 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1309,6 +1309,19 @@ WITHOUT_${W}:= true DOS2UNIX_REGEX?= .* +# At least KDE needs TMPDIR for the package building, +# so we're setting it to the known default value. +.if defined(PACKAGE_BUILDING) +TMPDIR?= /tmp +.endif # defined(PACKAGE_BUILDING) + +# Respect TMPDIR passed via make.conf or similar and pass it down +# to configure and make. +.if defined(TMPDIR) +MAKE_ENV+= TMPDIR="${TMPDIR}" +CONFIGURE_ENV+= TMPDIR="${TMPDIR}" +.endif # defined(TMPDIR) + # Start of pre-makefile section. .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK) |