diff options
Diffstat (limited to 'shells/bash')
| -rw-r--r-- | shells/bash/Makefile | 10 | ||||
| -rw-r--r-- | shells/bash/pkg-install | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 8fa0d105e064..08764fbb96aa 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -107,22 +107,22 @@ pre-build: @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build pre-install: - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ + @${SETENV} PKG_PREFIX="${PREFIX}" \ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @cd ${PREFIX}/bin ; ${LN} -sf bash rbash .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} .if !defined(WITH_INCLUDED_FAQ) @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/FAQ \ - ${WRKSRC}/doc/INTRO ${DESTDIR}${DOCSDIR} + ${WRKSRC}/doc/INTRO ${DOCSDIR} .else @${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ - ${WRKSRC}/doc/INTRO ${DESTDIR}${DOCSDIR} + ${WRKSRC}/doc/INTRO ${DOCSDIR} .endif @for d in ${PORTDOCS:NFAQ:NINTRO}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${d} ${DESTDIR}${DOCSDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${d} ${DOCSDIR}; \ done .endif @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ diff --git a/shells/bash/pkg-install b/shells/bash/pkg-install index 37a63a755364..99417b66ba6e 100644 --- a/shells/bash/pkg-install +++ b/shells/bash/pkg-install @@ -5,7 +5,7 @@ BASH="$(echo ${PKG_PREFIX-/usr/local}/bin/bash | /usr/bin/sed -e 's|//|/|g')" RBASH="$(echo ${PKG_PREFIX-/usr/local}/bin/rbash | /usr/bin/sed -e 's|//|/|g')" -SHELLS="${PKG_DESTDIR-}/etc/shells" +SHELLS="/etc/shells" case $2 in POST-INSTALL) |