[Midnightbsd-cvs] mports: devel/qmake4: I don't think this will matter, but let's try it.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jun 13 12:54:50 EDT 2008
Log Message:
-----------
I don't think this will matter, but let's try it.
For some reason on magus DESTDIR and PREFIX contain the fake destdir (prefixed on prefix), yet on my local system doing a fake does NOT include FAKE_DESTDIR in the PREFIX.
There must be a bug somewhere, because PREFIX should contain the same thing either way.
Modified Files:
--------------
mports/devel/qmake4:
Makefile (r1.3 -> r1.4)
mports/devel/qmake4/files:
Makefile.bsd (r1.2 -> r1.3)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/qmake4/Makefile -L devel/qmake4/Makefile -u -r1.3 -r1.4
--- 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}"
+MAKE_ENV+= FILESDIR="${FILESDIR}" ${FAKE_MAKEARGS}
#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.2
retrieving revision 1.3
diff -L devel/qmake4/files/Makefile.bsd -L devel/qmake4/files/Makefile.bsd -u -r1.2 -r1.3
--- devel/qmake4/files/Makefile.bsd
+++ devel/qmake4/files/Makefile.bsd
@@ -44,9 +44,9 @@
SHAREDIR= ${PREFIX}/share/qt4
${SHAREDIR}:
- mkdir -p "$@/mkspecs"
+ mkdir -p "$@"
beforeinstall: ${SHAREDIR}
- cp -Rp ${.CURDIR:H}/mkspecs ${DESTDIR}${SHAREDIR}/
+ cp -Rp ${.CURDIR:H}/mkspecs ${DESTDIR}${SHAREDIR}
.include <bsd.prog.mk>
More information about the Midnightbsd-cvs
mailing list