Date: Mon, 17 Jul 1995 00:10:39 -0700 From: asami@cs.berkeley.edu (Satoshi Asami) To: jkh@freefall.cdrom.com Cc: CVS-commiters@freefall.cdrom.com, cvs-share@freefall.cdrom.com Subject: Re: cvs commit: src/share/mk bsd.port.mk Message-ID: <199507170710.AAA09004@silvia.HIP.Berkeley.EDU> In-Reply-To: <199507151407.HAA26526@freefall.cdrom.com> (jkh@freefall.cdrom.com)
next in thread | previous in thread | raw e-mail | index | archive | help
* A regrettable hack to allow a port to say that it doesn't want its Makefiles
* made after the xmkmf run.
This is your change:
=======
>> cvs diff -u -r1.171 bsd.port.mk
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.171
diff -u -r1.171 bsd.port.mk
--- 1.171 1995/07/11 02:15:35
+++ bsd.port.mk 1995/07/15 15:14:21
@@ -3,7 +3,7 @@
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
#
-# $Id: bsd.port.mk,v 1.171 1995/07/11 02:15:35 asami Exp $
+# $Id: bsd.port.mk,v 1.172 1995/07/15 14:07:02 jkh Exp $
#
# Please view me with 4 column tabs!
@@ -576,10 +576,14 @@
./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
.endif
.if defined(USE_IMAKE)
+.if defined(X_NO_MAKE_MAKEFILES)
+ @(cd ${WRKSRC}; ${XMKMF})
+.else
.if defined(USE_GMAKE)
@(cd ${WRKSRC}; ${XMKMF} && ${GMAKE} Makefiles)
.else
@(cd ${WRKSRC}; ${XMKMF} && ${MAKE} Makefiles)
+.endif
.endif
.endif
.endif
=======
It seems to me like we can take out both the "make Makefiles" and the
"regrettable hack". It shouldn't be necessary for the regular case,
because ${XMKMF} is defined to be "xmkmf -a", which does (among other
things) "make Makefiles".
A little background information. This is where it was added:
=======
revision 1.19
date: 1994/08/25 21:02:45; author: jkh; state: Exp; lines: +2 -2
Also `make Makefiles' in USE_IMAKE case to catch subdirs.
Submitted by: jkh
=======
However, this is before the addition of "-a" to "xmkmf":
=======
revision 1.117
date: 1995/03/19 12:49:06; author: ats; state: Exp; lines: +3 -3
Change the xmkmf call to a xmkmf -a call. This should be more correct for
all X11R5 and X11R6 ports. This is the way how it should be normally
used according the manuals. Only pre-X1R5 ( X11R4, X11R3) ports can't
handle it.
=======
and the "make Makefiles" should have been taken out at this point.
Satoshi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199507170710.AAA09004>