[79071] trunk/base/src/macports1.0/Makefile

[jmr at macports.org]

Revision: 79071
          http://trac.macports.org/changeset/79071
Author:   jmr at macports.org
Date:     2011-05-31 20:28:18 -0700 (Tue, 31 May 2011)
Log Message:
-----------
make sure TCL_PACKAGE_DIR exists before creating symlink in it

Modified Paths:
--------------
    trunk/base/src/macports1.0/Makefile

Modified: trunk/base/src/macports1.0/Makefile
===================================================================
--- trunk/base/src/macports1.0/Makefile	2011-06-01 03:07:30 UTC (rev 79070)
+++ trunk/base/src/macports1.0/Makefile	2011-06-01 03:28:18 UTC (rev 79071)
@@ -32,11 +32,16 @@
 	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
 
 	echo "${TCL_PACKAGE_DIR}" > ${DESTDIR}${prefix}/var/macports/.tclpackage
-	if test -z "${DESTDIR}" && test "${INSTALLPKGLINK}" != "${INSTALLDIR}" && test -w "${TCL_PACKAGE_DIR}"; then \
-		if ! test -L "${INSTALLPKGLINK}" && test -d "${INSTALLPKGLINK}"; then \
-			rm -rf "${INSTALLPKGLINK}" || true; \
+	if test -z "${DESTDIR}" -a "${INSTALLPKGLINK}" != "${INSTALLDIR}"; then \
+		if test ! -d "${TCL_PACKAGE_DIR}"; then \
+			$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${TCL_PACKAGE_DIR}" || true; \
 		fi; \
-		if ! test -e "${INSTALLPKGLINK}"; then \
-			ln -s "${INSTALLDIR}" "${INSTALLPKGLINK}" || true; \
+		if test -w "${TCL_PACKAGE_DIR}"; then \
+			if test ! -L "${INSTALLPKGLINK}" && test -d "${INSTALLPKGLINK}"; then \
+				rm -rf "${INSTALLPKGLINK}" || true; \
+			fi; \
+			if test ! -e "${INSTALLPKGLINK}"; then \
+				ln -s "${INSTALLDIR}" "${INSTALLPKGLINK}" || true; \
+			fi; \
 		fi; \
 	fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110531/8e8b5c02/attachment.html>