aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/Makefile.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 63c2a3a..9b6a501 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,8 +1,15 @@
+<<<<<<< ChangeLog
+Fri Mar 13 15:45:44 1992 K. Richard Pixley (rich@cygnus.com)
+
+ * Makefile.in: pass down MAKEINFO explicitly on info.
+
+=======
Fri Mar 13 08:03:03 1992 Steve Chamberlain (sac@thepub.cygnus.com)
* flonum-const.c: renamed flonum-konst.c to stop dos name
conflict.
+>>>>>>> 1.43
Wed Mar 11 23:32:42 1992 K. Richard Pixley (rich@cygnus.com)
* configure.in: vxworks68 gets te-sun3.h.
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 543ccb7..215dd84 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -168,7 +168,7 @@ all: as.new
(cd doc ; $(MAKE) all)
info:
- (cd doc ; $(MAKE) info)
+ (cd doc ; $(MAKE) info "MAKEINFO=$(MAKEINFO)")
install-info:
(cd doc ; $(MAKE) install-info)