[Midnightbsd-cvs] mports: devel/qmake4: DESTDIR gets reset in the make environment.

[laffer1 at midnightbsd.org]

Log Message:
-----------
DESTDIR gets reset in the make environment.  When I run it locally, it uses the first value, but on magus it uses the second value DESTDIR=

Switch to using destdir= in our local makefile which doesn't get changed.  I'm still suspect of PREFIX, but we'll wait and see on that one.

Modified Files:
--------------
    mports/devel/qmake4:
        Makefile (r1.4 -> r1.5)
    mports/devel/qmake4/files:
        Makefile.bsd (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L devel/qmake4/Makefile -L devel/qmake4/Makefile -u -r1.4 -r1.5
--- devel/qmake4/Makefile
+++ devel/qmake4/Makefile
@@ -18,7 +18,7 @@
 REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/${DISTNAME}/qmake
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-MAKE_ENV+=	FILESDIR="${FILESDIR}" ${FAKE_MAKEARGS}
+MAKE_ENV+=	FILESDIR="${FILESDIR}" ${FAKE_MAKEARGS} destdir=${FAKE_DESTDIR}
 #USE_BZIP2=	yes
 
 EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
Index: Makefile.bsd
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/files/Makefile.bsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/qmake4/files/Makefile.bsd -L devel/qmake4/files/Makefile.bsd -u -r1.3 -r1.4
--- devel/qmake4/files/Makefile.bsd
+++ devel/qmake4/files/Makefile.bsd
@@ -43,10 +43,8 @@
 BINDIR=		${PREFIX}/bin
 SHAREDIR= 	${PREFIX}/share/qt4
 
-${SHAREDIR}:
-	mkdir -p "$@"
-
-beforeinstall: ${SHAREDIR}
-	cp -Rp ${.CURDIR:H}/mkspecs ${DESTDIR}${SHAREDIR}
+beforeinstall:
+	mkdir -p ${destdir}${SHAREDIR}
+	cp -Rp ${.CURDIR:H}/mkspecs ${destdir}${SHAREDIR}
 
 .include <bsd.prog.mk>