summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/m4/Makefile3
-rw-r--r--devel/m4/distinfo3
-rw-r--r--devel/m4/patches/patch-ad11
3 files changed, 15 insertions, 2 deletions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 9a6c9f4a80f..a3a67181e2b 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/05 11:34:26 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/05/08 01:59:07 reed Exp $
#
DISTNAME= m4-1.4
@@ -14,6 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
+MAKE_ENV+= INFO_DIR=${INFO_DIR}
INFO_FILES= m4.info
USE_MAKEINFO= yes
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index 106e9693eb9..25561816be5 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/09/23 14:44:43 salo Exp $
+$NetBSD: distinfo,v 1.5 2004/05/08 01:59:07 reed Exp $
SHA1 (m4-1.4.tar.gz) = 60bfd560128b9b60151c2c2441271043e803bbcf
Size (m4-1.4.tar.gz) = 317588 bytes
SHA1 (patch-aa) = 1cadcd91fcda6131bc1a8ab723a2cc199532ed07
SHA1 (patch-ab) = 217c506243100c7396045a3aab3c352dd9972403
SHA1 (patch-ac) = 8d7cdca40a5c76f2fd501e8b402ed179c8d38f6f
+SHA1 (patch-ad) = 963da42709b1e0b657817e76b001ec023ee64ba8
diff --git a/devel/m4/patches/patch-ad b/devel/m4/patches/patch-ad
new file mode 100644
index 00000000000..9abca48e8cf
--- /dev/null
+++ b/devel/m4/patches/patch-ad
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Fri May 7 18:51:27 2004
++++ Makefile.in Fri May 7 18:49:11 2004
+@@ -41,7 +41,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = $(exec_prefix)/bin
+-infodir = $(prefix)/info
++infodir = $(prefix)/$(INFO_DIR)
+
+ MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
+ prefix='$(prefix)' exec_prefix='$(exec_prefix)' \