diff options
author | uebayasi <uebayasi> | 2003-04-15 02:46:27 +0000 |
---|---|---|
committer | uebayasi <uebayasi> | 2003-04-15 02:46:27 +0000 |
commit | e5b6c04d36c8204ce4b118e051384380d36b15f0 (patch) | |
tree | 6a1809c7a772b40168fbf234473daa73aa06760d | |
parent | 6815cb78bb2dc60797917bb24e67626d8a85041e (diff) | |
download | pkgsrc-e5b6c04d36c8204ce4b118e051384380d36b15f0.tar.gz |
Redo the last more elaborately.
-rw-r--r-- | editors/emacs/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 7e7a4ff0f83..3474e8ee863 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2003/04/14 07:38:42 uebayasi Exp $ +# $NetBSD: Makefile,v 1.56 2003/04/15 02:46:27 uebayasi Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-21.3 @@ -36,8 +36,13 @@ CONFIGURE_ARGS+= --with-png .include "../../mk/bsd.prefs.mk" +# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1. .if ${OPSYS} == "NetBSD" && \ - (empty(OS_VERSION:M[0-1].[0-5]*) && empty(OS_VERSION:M1.6[A-P]*)) + (empty(OS_VERSION:M1.[0-5]*) && \ + empty(OS_VERSION:M1.6_*) && \ + empty(OS_VERSION:M1.6) && \ + empty(OS_VERSION:M1.6.[0-9]*) && \ + empty(OS_VERSION:M1.6[A-P]*)) # If using GNU ld 2.13.2.1 or later, avoid creating combined reloc # sections and .data reloc sections, both of which Emacs can't handle # properly. Analyzed by Stephen Ma. |