Various fixes

diff --git a/ChangeLog b/ChangeLog
index c0099aebddbcb2e7abd65a0e5ed700b4ebece2c4..819724d9ae68425a5530d35474ab1483bebf5a6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jun  7 12:31:31 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (handle_tests): Fix quoting on `pwd`.
+       (handle_options): Recognize no-installinfo option.
+       (handle_man_pages): Don't put man directory on @installdirs if
+       no-installman is specified.
+       (handle_texinfo): Handle no-installinfo option.
+
+       * dejagnu.am (check-DEJAGNU): Depend on site.exp.
+
 Sun Jun  2 10:33:10 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (handle_emacs_lisp): New function.

diff --git a/TODO b/TODO
index 3622f021fb9f528dd25e2c44917ebe7f76711b61..39a7bcfc3f31b505ea8c4eab0ad6d556eab3b03a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,9 @@
 Priorities for release:
   [ none ]
 
+** Write test case to check that no-installman suppresses dirs on
+    "make installdirs"
+
 consider supporting "var+= stuff" syntax.  rewrite to just var=... on
 output.  This is sometimes convenient when you want to write a
 Makefile.am in more-or-less modular parts
@@ -275,6 +278,8 @@ document new variables introduced when AC_CANONICAL_* used
 
 document _LISP handling
 
+document no-installinfo option
+
 ================================================================
 
 Libraries:

diff --git a/automake.in b/automake.in
index e9dedc35dd0bd3e759544630d479480546fc279e..1eda9f32a086d57c58c5b0abd1fb6a008f9b2939 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -435,7 +435,7 @@ sub handle_options
        }
        elsif ($_ eq 'no-installman' || $_ eq 'ansi2knr'
               || $_ eq 'dist-shar' || $_ eq 'dist-zip'
-              || $_ eq 'dejagnu')
+              || $_ eq 'dejagnu' || $_ eq 'no-installinfo')
        {
            # Explicitly recognize these.
        }
@@ -953,17 +953,21 @@ sub handle_texinfo
     &push_phony_cleaners ('info');
 
     push (@suffixes, '.texi', '.info', '.dvi');
-    push (@uninstall, 'uninstall-info');
+
+    if (! defined $options{'no-installinfo'})
+    {
+       push (@uninstall, 'uninstall-info');
+       push (@installdirs, '$(infodir)');
+       unshift (@install_data, 'install-info');
+
+       # Make sure documentation is made and installed first.  Use
+       # $(INFO_DEPS), not 'info', because otherwise recursive makes
+       # get run twice during "make all".
+       unshift (@all, '$(INFO_DEPS)');
+    }
     push (@clean, 'info');
     push (@info, '$(INFO_DEPS)');
     push (@dvi, '$(DVIS)');
-    push (@installdirs, '$(infodir)');
-    unshift (@install_data, 'install-info');
-
-    # Make sure documentation is made and installed first.  Use
-    # $(INFO_DEPS), not 'info', because otherwise recursive makes get
-    # run twice during "make all".
-    unshift (@all, '$(INFO_DEPS)');
 
     $output_vars .= ("INFOS = " . join (' ', @infos_list) . "\n"
                     . "INFO_DEPS = " . join (' ', @info_deps_list)  . "\n"
@@ -1008,7 +1012,8 @@ sub handle_man_pages
     $output_rules .= "install-man: \$(MANS)\n";
     foreach (keys %sections)
     {
-       push (@installdirs, '$(mandir)/man' . $_);
+       push (@installdirs, '$(mandir)/man' . $_)
+           unless defined $options{'no-installman'};
        $output_rules .= ("\t" . '$(mkinstalldirs) $(mandir)/man'
                          . $_ . "\n");
     }
@@ -1914,7 +1919,7 @@ sub handle_tests
                          . "\t\@echo '# edit the last section' >> site.exp\n"
                          . "\t\@echo 'set tool \$(DEJATOOL)' >> site.exp\n"
                          . "\t\@echo 'set srcdir \$(srcdir)' >> site.exp\n"
-                         . "\t\@echo 'set objdir \`pwd\`' >> site.exp\n");
+                         . "\t\@echo 'set objdir' \`pwd\` >> site.exp\n");
 
        # Extra stuff for AC_CANONICAL_*
        local (@whatlist) = ();

diff --git a/config.guess b/config.guess
index 213b9eec16f05874dbd52c8e1c551cf1b6769bda..d8c24708afe6a6611c18f41103b1ef4693193f67 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -51,15 +51,13 @@ trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:[VX]*:*)
-       # After 1.2, OSF1 uses "V1.3" for uname -r.
-       # After 4.x, OSF1 uses "X4.x" for uname -r.
-       echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VX]//'`
-       exit 0 ;;
     alpha:OSF1:*:*)
+       # A Vn.n version is a released version.
+       # A Tn.n version is a released field test version.
+       # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
-       echo alpha-dec-osf${UNAME_RELEASE}
-        exit 0 ;;
+       echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
+       exit 0 ;;
     21064:Windows_NT:50:3)
        echo alpha-dec-winnt3.5
        exit 0 ;;
@@ -138,7 +136,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`uname -p`
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
         if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
        if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
             -o ${TARGET_BINARY_INTERFACE}x = x ] ; then

diff --git a/dejagnu.am b/dejagnu.am
index cbd86b2b2e8dbc3b4ce4775fa864f6233dd76064..189394855569f2b31ec6df3b3498ca412139dd8e 100644 (file)
--- a/dejagnu.am
+++ b/dejagnu.am
@@ -34,7 +34,7 @@ RUNTESTFLAGS =
 ## Name of tool to use.  Default is the same as the package.
 DEJATOOL = $(PACKAGE)
 
-check-DEJAGNU:
+check-DEJAGNU: site.exp
        rootme=`cd $(top_builddir) && pwd`; \
 ## Life is easiest with an absolute srcdir, so do that.
        srcdir=`cd $(srcdir) && pwd`; export srcdir; \

diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index cbd86b2b2e8dbc3b4ce4775fa864f6233dd76064..189394855569f2b31ec6df3b3498ca412139dd8e 100644 (file)
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -34,7 +34,7 @@ RUNTESTFLAGS =
 ## Name of tool to use.  Default is the same as the package.
 DEJATOOL = $(PACKAGE)
 
-check-DEJAGNU:
+check-DEJAGNU: site.exp
        rootme=`cd $(top_builddir) && pwd`; \
 ## Life is easiest with an absolute srcdir, so do that.
        srcdir=`cd $(srcdir) && pwd`; export srcdir; \

diff --git a/lib/config.guess b/lib/config.guess
index 213b9eec16f05874dbd52c8e1c551cf1b6769bda..d8c24708afe6a6611c18f41103b1ef4693193f67 100755 (executable)
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -51,15 +51,13 @@ trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:[VX]*:*)
-       # After 1.2, OSF1 uses "V1.3" for uname -r.
-       # After 4.x, OSF1 uses "X4.x" for uname -r.
-       echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VX]//'`
-       exit 0 ;;
     alpha:OSF1:*:*)
+       # A Vn.n version is a released version.
+       # A Tn.n version is a released field test version.
+       # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
-       echo alpha-dec-osf${UNAME_RELEASE}
-        exit 0 ;;
+       echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
+       exit 0 ;;
     21064:Windows_NT:50:3)
        echo alpha-dec-winnt3.5
        exit 0 ;;
@@ -138,7 +136,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`uname -p`
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
         if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
        if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
             -o ${TARGET_BINARY_INTERFACE}x = x ] ; then