diff options
Diffstat (limited to 'emulators/netbsd32_compat15/Makefile')
| -rw-r--r-- | emulators/netbsd32_compat15/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile index 5ab6c76b18e..86b204d1509 100644 --- a/emulators/netbsd32_compat15/Makefile +++ b/emulators/netbsd32_compat15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:21 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:11 rillig Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -27,12 +27,12 @@ USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR} -FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} -FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR} -FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH} -FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT} -FILES_SUBST+= LDCONFIG=${LDCONFIG} +FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q} +FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} +FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} +FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} +FILES_SUBST+= OBJECT_FMT=${OBJECT_FMT:Q} +FILES_SUBST+= LDCONFIG=${LDCONFIG:Q} .include "../../mk/bsd.prefs.mk" @@ -41,23 +41,23 @@ COMPAT_LIBDIR= ${EMULSUBDIR}/usr/lib COMPAT_LIBEXECDIR= ${EMULSUBDIR}/usr/libexec COMPAT_XLIBDIR= ${EMULSUBDIR}/usr/X11R6/lib -PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR} +PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} # XXX using pax to copy symlinks properly. do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR} - (cd ${WRKDIR}/lib; pax -rwv lib*.so* ${PREFIX}/${COMPAT_LIBDIR}; \ + (cd ${WRKDIR}/lib; ${PAX} -rwv lib*.so* ${PREFIX}/${COMPAT_LIBDIR}; \ ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBDIR}/lib*.so*; \ ${CHMOD} 555 ${PREFIX}/${COMPAT_LIBDIR}/lib*.so* ) if [ -d ${WRKDIR}/X11R6/lib ]; then \ ${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \ - (cd ${WRKDIR}/X11R6/lib; pax -rwv lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \ + (cd ${WRKDIR}/X11R6/lib; ${PAX} -rwv lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \ ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so*; \ ${CHMOD} 555 ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so* ) \ fi if [ -d ${WRKDIR}/libexec ]; then \ ${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBEXECDIR}; \ - (cd ${WRKDIR}/libexec; pax -rwv ld.*so ${PREFIX}/${COMPAT_LIBEXECDIR}; \ + (cd ${WRKDIR}/libexec; ${PAX} -rwv ld.*so ${PREFIX}/${COMPAT_LIBEXECDIR}; \ ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so; \ ${CHMOD} 555 ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so ) \ fi |