diff options
| author | rakuco <rakuco@FreeBSD.org> | 2014-10-30 06:43:21 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2014-10-30 06:43:21 +0800 |
| commit | de90f3eb3aef7a8bc344dc57a2081df5e81230b3 (patch) | |
| tree | 07071d2f275ff623363397df8f55b6e6fc8be33a | |
| parent | 2e55eef59ddca399b9deb5afa84a76ce5d286dc1 (diff) | |
| download | freebsd-ports-gnome-de90f3eb3aef7a8bc344dc57a2081df5e81230b3.tar.gz freebsd-ports-gnome-de90f3eb3aef7a8bc344dc57a2081df5e81230b3.tar.zst freebsd-ports-gnome-de90f3eb3aef7a8bc344dc57a2081df5e81230b3.zip | |
bsd.qt.mk: Stop using @cwd in the plist generation code.
Just specify full paths with ${QT_PREFIX} directly, as @cwd is deprecated.
| -rw-r--r-- | Mk/bsd.qt.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 254c11a40719..76ac28b42672 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -613,17 +613,16 @@ qt-post-install: @${ECHO_CMD} \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h . endfor - @${ECHO_CMD} "@cwd ${QT_PREFIX}" >> ${TMPPLIST} - @${ECHO_CMD} "${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \ + @${ECHO_CMD} "${QT_PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \ + >> ${TMPPLIST} + @${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> ${QT_PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \ >> ${TMPPLIST} - @${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> %D/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" >> ${TMPPLIST} . endif # ${QT_DEFINES:N-*} . if ${QT_CONFIG:N-*} @${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules ${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \ > ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri - @${ECHO_CMD} "@cwd ${QT_PREFIX}" >> ${TMPPLIST} - @${ECHO_CMD} "${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \ + @${ECHO_CMD} "${QT_PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \ >> ${TMPPLIST} . endif # ${QT_CONFIG:N-*} .endif # defined(QT_DIST) && ! ${_QT_VERSION:M4*} |