pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Test for ${PREFIX} existence before mkdir'ing it.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e4aa8f15be8
branches:  trunk
changeset: 460662:0e4aa8f15be8
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Sep 02 12:01:14 2003 +0000

description:
Test for ${PREFIX} existence before mkdir'ing it.
This fix NO_MTREE installation on Solaris when ${PREFIX} already exists
and is a symlink.

Example:

# uname -sr
SunOS 5.9
# cd /tmp
# rm -f foo
# ln -s /etc foo
# /bin/mkdir -p /tmp/foo
mkdir: "/tmp/foo": Exists but is not a directory
#

diffstat:

 mk/bsd.pkg.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 5f2f02b57e7a -r 0e4aa8f15be8 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Sep 02 11:46:10 2003 +0000
+++ b/mk/bsd.pkg.mk     Tue Sep 02 12:01:14 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1252 2003/09/02 06:59:42 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1253 2003/09/02 12:01:14 seb Exp $
 #
 # This file is in the public domain.
 #
@@ -2530,7 +2530,7 @@
                ${ECHO_MSG} "Become root and try again to ensure correct permissions."; \
        fi
 .else
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PREFIX}
+       ${_PKG_SILENT}${_PKG_DEBUG}[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 .endif # !NO_MTREE
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install-script
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install



Home | Main Index | Thread Index | Old Index