Date: Wed, 20 Dec 1995 02:41:53 -0800 (PST) From: asami@cs.berkeley.edu (Satoshi Asami) To: jmacd@cory.EECS.Berkeley.EDU Cc: ports@freebsd.org Subject: Re: bsd.port.subdir.mk Message-ID: <199512201041.CAA03031@silvia.HIP.Berkeley.EDU> In-Reply-To: <199512181341.FAA13166@cory.EECS.Berkeley.EDU> (message from Josh MacDonald on Mon, 18 Dec 1995 05:41:09 -0800)
next in thread | previous in thread | raw e-mail | index | archive | help
* 30c30
* < else if test -d ${.CURDIR}/$${entry}; then \
* begin 644 bsd.port.subdir.mk.diff
I think you knew better than send a non-context diff, one in the text
and another one uuencoded. ;)
Anyway, I looked at your patch, took the gist and produced this patch.
It seems to work here, so please test it, guys.
Satoshi
-------
--- /usr/src/share/mk/bsd.port.subdir.mk Mon Mar 20 19:59:13 1995
+++ /usr/share/mk/bsd.port.subdir.mk Wed Dec 20 02:36:51 1995
@@ -26,12 +26,18 @@
if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
${ECHO_MSG} "===> ${DIRPRFX}$${entry}.${MACHINE}"; \
edir=$${entry}.${MACHINE}; \
- cd ${.CURDIR}/$${edir}; \
else \
- ${ECHO_MSG} "===> ${DIRPRFX}$$entry"; \
- edir=$${entry}; \
- cd ${.CURDIR}/$${edir}; \
+ if test -d ${.CURDIR}/$${entry}; then \
+ ${ECHO_MSG} "===> ${DIRPRFX}$$entry"; \
+ edir=$${entry}; \
+ else \
+ ${ECHO_MSG} "===> ${DIRPRFX}$${entry} non-existent"; \
+ OK="false"; \
+ fi; \
fi; \
+ fi; \
+ if [ "$$OK" = "" ]; then \
+ cd ${.CURDIR}/$${edir}; \
${MAKE} ${.TARGET:realinstall=install} \
DIRPRFX=${DIRPRFX}$$edir/; \
fi; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199512201041.CAA03031>