summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/android-tools-adb-devel/Makefile1
-rw-r--r--devel/android-tools-adb/Makefile2
-rw-r--r--devel/android-tools-fastboot/Makefile2
3 files changed, 2 insertions, 3 deletions
diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index 54b628061fe2..fc48dfff1e27 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -10,7 +10,6 @@ CONFLICTS_INSTALL= ${PORTNAME}-[0-9]*
MASTERDIR= ${.CURDIR}/../android-tools-adb
DISTINFO_FILE= ${.CURDIR}/distinfo
-FILESDIR= ${.CURDIR}/files
EXTRA_PATCHES= ${.CURDIR}/files/patch-*
GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index ba69245c1d92..ba03bba95c76 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -39,7 +39,7 @@ BUILD_WRKSRC= ${WRKSRC}/adb
INSTALL_WRKSRC= ${BUILD_WRKSRC}
TEST_WRKSRC= ${BUILD_WRKSRC}
CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
-MAKEFILE= ${FILESDIR}/Makefile
+MAKEFILE?= ${.CURDIR}/files/Makefile
MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}"
ALL_TARGET= all
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index 10eae9df3720..de2ff840700e 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -37,7 +37,7 @@ CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
USES= compiler:c++11-lib pkgconfig uidfix
BUILD_WRKSRC= ${WRKSRC}/fastboot
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-MAKEFILE= ${.CURDIR}/files/Makefile # XXX ?= when bmake-only
+MAKEFILE?= ${.CURDIR}/files/Makefile
MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" \
MANDIR="${PREFIX}/man/man" \