diff options
| -rw-r--r-- | Mk/bsd.emacs.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.gnome.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 34 |
3 files changed, 21 insertions, 19 deletions
diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk index daf615496247..eb22cfe28f41 100644 --- a/Mk/bsd.emacs.mk +++ b/Mk/bsd.emacs.mk @@ -1,5 +1,5 @@ # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.58 2006-08-04 12:34:41 erwin Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.59 2006-08-14 13:24:18 erwin Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -237,7 +237,7 @@ check-makevars:: # find where emacsen is installed # look for it in PREEFIX first and fall back to LOCALBASE then .if exists(${TARGETDIR}/bin/${EMACS_NAME}-${EMACS_VER}) -EMACS_BASE?= ${DESTDIR}${PREFIX} +EMACS_BASE?= ${TARGETDIR} .else EMACS_BASE?= ${LOCALBASE} .endif diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 91f95bd0359b..0b7863544103 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -728,7 +728,7 @@ gnome-pre-su-install: @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${TARGETDIR}/ >/dev/null .endif .if defined(GCONF_SCHEMAS) - @${MKDIR} ${DESTDIR}${PREFIX}/etc/gconf/gconf.xml.defaults/ + @${MKDIR} ${TARGETDIR}/etc/gconf/gconf.xml.defaults/ .else @${DO_NADA} .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 6d5c32908bc8..f0cf7abf40d4 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1370,21 +1370,22 @@ PREFIX?= ${LOCALBASE_REL} .if defined(USE_LINUX_PREFIX) .if !defined(DESTDIR) LDCONFIG_CMD?= ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL} +LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD} +LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG_CMD} .else LDCONFIG_CMD?= ${CHROOT} ${DESTDIR} ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL} -.endif LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD} -LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG_CMD} +LDCONFIG_PLIST_UNEXEC_CMD?= ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL} +.endif .else .if !defined(DESTDIR) LDCONFIG_CMD?= ${LDCONFIG} -m ${LDCONFIG_RUNLIST} LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG} -m ${LDCONFIG_PLIST} -LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG} -R .else LDCONFIG_CMD?= ${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_RUNLIST} LDCONFIG_PLIST_EXEC_CMD?= ${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_PLIST} -LDCONFIG_PLIST_UNEXEC_CMD?= ${CHROOT} ${DESTDIR} ${LDCONFIG} -R .endif +LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG} -R .endif PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg @@ -1588,8 +1589,9 @@ INSTALL_WRKSRC?=${WRKSRC} PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} -SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ - DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} +SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ + DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \ + DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} PLIST_REINPLACE+= dirrmtry PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true! @@ -5512,7 +5514,7 @@ install-rc-script: @${ECHO_CMD} "===> Installing early rc.d startup script(s)" @${ECHO_CMD} "@cwd /" >> ${TMPPLIST} @for i in ${USE_RCORDER}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \ + ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${DESTDIR}/etc/rc.d/$${i%.sh}; \ ${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ done @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @@ -5581,13 +5583,13 @@ fake-pkg: fi @${RM} -rf ${PKG_DBDIR}/${PKGNAME} .endif -.if !exists(${PKG_DBDIR}/${PKGNAME}) -.if !defined(DESTDIR) - @${ECHO_MSG} "===> Registering installation for ${PKGNAME}" -.else - @${ECHO_MSG} "===> Registering installation for ${PKGNAME} in ${DESTDIR}" -.endif - @${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \ + @if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \ + if [ -z "${DESTDIR}" ] ; then \ + ${ECHO_MSG} "===> Registering installation for ${PKGNAME}"; \ + else \ + ${ECHO_MSG} "===> Registering installation for ${PKGNAME} in ${DESTDIR}"; \ + fi; \ + ${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \ ${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \ ${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \ ${ECHO_CMD} ${COMMENT:Q} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \ @@ -5610,8 +5612,8 @@ fake-pkg: ${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \ fi; \ fi; \ - done -.endif + done; \ + fi .if !defined(NO_MTREE) @if [ -f ${MTREE_FILE} ]; then \ ${CP} ${MTREE_FILE} ${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \ |