diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-05-24 18:38:58 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-05-24 18:38:58 +0000 |
| commit | 8efc4185a98706fe664e11fa4fb44acb105393be (patch) | |
| tree | 0b362f4f544ea83a9933c93dcb26700d6a395fc8 /lang/gcc3/patches/patch-ab | |
| parent | 0ca23e301d7f051acc2021f8ed0702b45e775fa5 (diff) | |
| download | pkgsrc-8efc4185a98706fe664e11fa4fb44acb105393be.tar.gz | |
use ${INSTALL_INFO} rather than install-info, so that we don't accidently
use an old or non-compatible version that may be in the base system.
This makes this package install flawlessly under Linux, and even though it does
not directly address PR pkg/20880 (which I could not reproduce), it covers
similar problems.
Diffstat (limited to 'lang/gcc3/patches/patch-ab')
| -rw-r--r-- | lang/gcc3/patches/patch-ab | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab index 8e273eb3f17..3c002f47ffb 100644 --- a/lang/gcc3/patches/patch-ab +++ b/lang/gcc3/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2003/05/22 09:37:28 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2003/05/24 18:38:58 jschauma Exp $ ---- gcc/Makefile.in.orig Fri Apr 18 08:36:04 2003 -+++ gcc/Makefile.in -@@ -1236,6 +1236,7 @@ c-semantics.o : c-semantics.c $(CONFIG_H +--- gcc/Makefile.in.orig Tue Jan 28 16:54:07 2003 ++++ gcc/Makefile.in Sat May 24 13:01:38 2003 +@@ -1236,6 +1236,7 @@ # Language-independent files. DRIVER_DEFINES = \ @@ -10,3 +10,17 @@ $NetBSD: patch-ab,v 1.1 2003/05/22 09:37:28 wiz Exp $ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \ -DDEFAULT_TARGET_VERSION=\"$(version)\" \ +@@ -2662,11 +2663,11 @@ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ + done; \ + else true; fi +- -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ ++ -if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \ + if [ -f $(DESTDIR)$(infodir)/dir ] ; then \ + for f in cpp.info gcc.info gccint.info cppinternals.info; do \ + if [ -f $(DESTDIR)$(infodir)/$$f ]; then \ +- install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ ++ ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ + else true; fi; \ + done; \ + else true; fi; \ |