[Bug-dejagnu] [patch] 1.4.2, current: Makefile fixes

[Maciej W. Rozycki]

Hi,

 Following are a few Makefile fixes, please apply.

2001-11-16  Maciej W. Rozycki  <address@hidden>

        * Makefile.am (include_dest): New variable.
        (install-data-local): Install dejagnu.h in include_dest.
        (uninstall-local): Remove dejagnu.h from include_dest.

        * Makefile.am (install-data-local): Fix comments to satisfy
        portability.

        * Makefile.in: Regenerate.

        * doc/Makefile.am (install-doc): Don't install runtest.1; it's
        already done by install-data.
        * doc/Makefile.in: Regenerate.

  Maciej

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: address@hidden, PGP key available        +

dejagnu-1.4.2-make.patch
diff -up --recursive --new-file dejagnu-1.4.2.macro/Makefile.am 
dejagnu-1.4.2/Makefile.am
--- dejagnu-1.4.2.macro/Makefile.am     Wed Sep 12 21:23:33 2001
+++ dejagnu-1.4.2/Makefile.am   Fri Nov 16 00:30:22 2001
@@ -116,21 +116,23 @@ lib_files = $(srcdir)/*.c $(srcdir)/lib/
 baseboards_dest = $(DESTDIR)$(pkgdatadir)/baseboards
 baseboards_files = $(srcdir)/baseboards/README $(srcdir)/baseboards/*.exp
 
+include_dest = $(DESTDIR)$(includedir)
+
 config_dest = $(DESTDIR)$(pkgdatadir)/config
 config_files = $(srcdir)/config/README $(srcdir)/config/*.exp
 
 install-data-local:
-       $(mkinstalldirs) $(lib_dest) $(includedir)
+       $(mkinstalldirs) $(lib_dest) $(include_dest)
        for f in $(lib_files); do \
          test ! -f "$$f" || $(INSTALL_DATA) $$f $(lib_dest); \
-       done
+       done; \
        #
        $(mkinstalldirs) $(baseboards_dest)
        for f in $(baseboards_files); do \
          test ! -f "$$f" || $(INSTALL_DATA) $$f $(baseboards_dest); \
-       done
+       done; \
        #
-       $(INSTALL_DATA) $(srcdir)/dejagnu.h $(includedir); \
+       $(INSTALL_DATA) $(srcdir)/dejagnu.h $(include_dest); \
        #
        $(mkinstalldirs) $(config_dest)
        for f in $(config_files); do \
@@ -151,7 +153,7 @@ uninstall-local:
        for f in $(baseboards_files); do \
          test ! -f "$$f" || rm -f $(baseboards_dest)/`basename "$$f"`; \
        done
-       rm -f $(includedir)/dejagnu.h;
+       rm -f $(include_dest)/dejagnu.h;
 
 site.exp: Makefile
        @echo 'Making a new site.exp file...'
diff -up --recursive --new-file dejagnu-1.4.2.macro/doc/Makefile.am 
dejagnu-1.4.2/doc/Makefile.am
--- dejagnu-1.4.2.macro/doc/Makefile.am Sun May  6 16:34:20 2001
+++ dejagnu-1.4.2/doc/Makefile.am       Fri Nov 16 00:46:54 2001
@@ -63,6 +63,5 @@ install-doc: $(TARGETS)
        $(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.rtf
        $(INSTALL_DATA) overview.ps $(DESTDIR)$(pkgdatadir)/dejagnu.ps
        $(INSTALL_DATA) overview.pdf $(DESTDIR)$(pkgdatadir)/dejagnu.pdf
-       $(INSTALL_DATA) $(srcdir)/runtest.1 $(mandir)/man1/