changeset 412:5125546873a9

7067907 gnu sdiff has become broken from an assumption gnu utilities live in /usr/bin
author Rich Burridge <rich.burridge@oracle.com>
date Mon, 18 Jul 2011 09:57:40 -0700
parents 47dc7d1d6551
children 1a6d7a739179
files components/diffutils/Makefile components/diffutils/diffutils.p5m
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/components/diffutils/Makefile	Mon Jul 18 09:36:51 2011 -0700
+++ b/components/diffutils/Makefile	Mon Jul 18 09:57:40 2011 -0700
@@ -36,6 +36,8 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+CONFIGURE_BINDIR.32 =		$(CONFIGURE_PREFIX)/gnu/bin
+
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
--- a/components/diffutils/diffutils.p5m	Mon Jul 18 09:36:51 2011 -0700
+++ b/components/diffutils/diffutils.p5m	Mon Jul 18 09:57:40 2011 -0700
@@ -95,10 +95,10 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file usr/bin/cmp path=usr/gnu/bin/cmp
-file usr/bin/diff path=usr/gnu/bin/diff
-file usr/bin/diff3 path=usr/gnu/bin/diff3
-file usr/bin/sdiff path=usr/gnu/bin/sdiff
+file path=usr/gnu/bin/cmp
+file path=usr/gnu/bin/diff
+file path=usr/gnu/bin/diff3
+file path=usr/gnu/bin/sdiff
 file path=usr/share/info/diff.info
 file path=usr/share/locale/ca/LC_MESSAGES/diffutils.mo
 file path=usr/share/locale/cs/LC_MESSAGES/diffutils.mo