This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] Automake install-info problem in gas/


On Thu, Oct 30, 2003 at 06:43:38AM +0100, Andreas Jaeger wrote:
> "H. J. Lu" <hjl@lucon.org> writes:
> 
> > This is the beta release of binutils 2.14.90.0.7 for Linux, which is
> > based on binutils 2003 1029 in CVS on sources.redhat.com plus various
> > changes. It is purely for Linux.
> >
> > Please report any bugs related to binutils 2.14.90.0.7 to hjl@lucon.org.
> >
> > If you don't use
> >
> > # rpmbuild -ta binutils-xx.xx.xx.xx.xx.tar.gz
> >
> > to compile the Linux binutils, please read patches/README in source
> > tree to apply Linux patches.
> >
> > Changes from binutils 2.14.90.0.6:
> >
> > 1. Update from binutils 2003 1029.
> > 2. Allow type changes for undefined symbols.
> > 3. Fix EH frame optimization.
> > 4. Fix the check for undefined versioned symbol with wildcard.
> > 5. Support generating code for Itanium.
> > 6. Detect and warn bad symbol index.
> > 7. Update IPF assemebler DV check.
> >
> 
> This one does not install the gas documentation.  A "make install
> install-info" does not install any gas docs.  I had to do this:
> make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
> 
> Daniel, this looks like a fallout from the conversion to autoconf
> 2.57.  Can you look into this, please?

>From the conversion to automake 1.7, rather.  This patch fixes it
although I'm not terribly happy overriding install or referencing
RECURSIVE_TARGETS.  I've attached a patch, including changes to
generated files so that you can see what I mean.

The gist of the problem is that AUTOMAKE_OPTIONS = cygnus now overrides
more than it used to in texinfos.am.

Does anyone see a better way?  If not, I'll commit this.

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

2003-11-03  Daniel Jacobowitz  <drow@mvista.com>

	* Makefile.am (install, install-info, RECURSIVE_TARGETS): Define.
	* doc/Makefile.am (install-info): Define.

	* aclocal.m4: Regenerate.
	* Makefile.in: Regenerate.
	* doc/Makefile.in: Regenerate.

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile.am
--- Makefile.am	14 Aug 2003 07:04:09 -0000	1.80
+++ Makefile.am	3 Nov 2003 16:39:39 -0000
@@ -456,6 +456,12 @@ po/POTFILES.in: @MAINT@ Makefile
 	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
+# We want install to imply install-info as per GNU standards, despite the
+# cygnus option.
+install: install-recursive install-info
+install-info: install-info-recursive
+RECURSIVE_TARGETS += install-info-recursive
+
 # Note: GASP is now deprecated and has been removed.  It is still
 # available in the CVS archive or older binutils releases if it is needed.
 noinst_PROGRAMS = as-new
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/Makefile.in,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile.in
--- Makefile.in	2 Sep 2003 17:59:12 -0000	1.91
+++ Makefile.in	3 Nov 2003 16:39:39 -0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.7.8 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -628,6 +628,7 @@ POTFILES = $(MULTI_CFILES) $(TARGET_ENV_
 	$(OBJ_FORMAT_CFILES) $(TARGET_CPU_HFILES) $(TARGET_CPU_CFILES) \
 	$(HFILES) $(CFILES) $(GAS_CFILES)
 
+RECURSIVE_TARGETS = install-info-recursive
 
 # Note: GASP is now deprecated and has been removed.  It is still
 # available in the CVS archive or older binutils releases if it is needed.
@@ -2557,9 +2558,9 @@ YLWRAP = $(top_srcdir)/../ylwrap
 DIST_SOURCES = $(as_new_SOURCES) $(EXTRA_as_new_SOURCES) \
 	$(itbl_test_SOURCES)
 
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive uninstall-info-recursive all-recursive \
-	install-data-recursive install-exec-recursive \
+RECURSIVE_TARGETS = install-info-recursive info-recursive dvi-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
 	installdirs-recursive install-recursive uninstall-recursive \
 	check-recursive installcheck-recursive
 SOURCES = $(as_new_SOURCES) $(EXTRA_as_new_SOURCES) $(itbl_test_SOURCES)
@@ -2809,8 +2810,6 @@ check: check-recursive
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-
-install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
@@ -2831,7 +2830,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -2847,6 +2846,7 @@ clean-am: clean-generic clean-libtool cl
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
 distclean-am: clean-am distclean-DEJAGNU distclean-compile \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags
@@ -2871,7 +2871,8 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf autom4te.cache
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
@@ -2912,6 +2913,11 @@ uninstall-info: uninstall-info-recursive
 po/POTFILES.in: @MAINT@ Makefile
 	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
+
+# We want install to imply install-info as per GNU standards, despite the
+# cygnus option.
+install: install-recursive install-info
+install-info: install-info-recursive
 
 $(srcdir)/make-gas.com: stamp-mk.com
 stamp-mk.com: vmsconf.sh Makefile
Index: aclocal.m4
===================================================================
RCS file: /cvs/src/src/gas/aclocal.m4,v
retrieving revision 1.15
diff -u -p -r1.15 aclocal.m4
--- aclocal.m4	2 Sep 2003 17:59:12 -0000	1.15
+++ aclocal.m4	3 Nov 2003 16:39:40 -0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.8 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -263,7 +263,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7.6])])
+	 [AM_AUTOMAKE_VERSION([1.7.8])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
Index: doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.am,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile.am
--- doc/Makefile.am	1 Apr 2003 15:50:30 -0000	1.25
+++ doc/Makefile.am	3 Nov 2003 16:39:40 -0000
@@ -68,6 +68,7 @@ as.dvi: $(srcdir)/as.texinfo asconfig.te
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
 install: install-info
+install-info: install-info-am
 
 # This one isn't ready for prime time yet.  Not even a little bit.
 
Index: doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.in,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile.in
--- doc/Makefile.in	2 Sep 2003 17:59:13 -0000	1.52
+++ doc/Makefile.in	3 Nov 2003 16:39:40 -0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.7.8 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -293,7 +293,7 @@ DVIPS = dvips
 uninstall-info-am:
 	$(PRE_UNINSTALL)
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -412,7 +412,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -424,7 +424,7 @@ clean: clean-am
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-libtool
 
 dvi: dvi-am
@@ -459,7 +459,7 @@ install-info-am: $(INFO_DEPS)
 	done
 	@$(POST_INSTALL)
 	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -472,7 +472,7 @@ install-man: install-man1
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
 	maintainer-clean-generic
 
@@ -522,6 +522,7 @@ as.dvi: $(srcdir)/as.texinfo asconfig.te
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
 install: install-info
+install-info: install-info-am
 
 # Maintenance
 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]