[Bug-dejagnu] [patch] dejagnu 1.4.3: DESTDIR for dejagnu.h

[Maciej W. Rozycki]

Hello,

 There is a small problem when installing dejagnu.h.  It doesn't use
DESTDIR possibly leading to installation failures.  Here is a patch to fix
it.  Please apply. 

2002-10-29  Maciej W. Rozycki  <address@hidden>

        * Makefile.am (include_dest): New variable for installation of
        $(includedir).

  Maciej

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

dejagnu-1.4.3-make.patch
diff -up --recursive --new-file dejagnu-1.4.3.macro/Makefile.am 
dejagnu-1.4.3/Makefile.am
--- dejagnu-1.4.3.macro/Makefile.am     2002-09-04 20:36:08.000000000 +0000
+++ dejagnu-1.4.3/Makefile.am   2002-10-06 01:50:25.000000000 +0000
@@ -158,11 +158,13 @@ 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
@@ -170,7 +172,7 @@ install-data-local:
        for f in $(baseboards_files); do \
          test ! -f "$$f" || $(INSTALL_DATA) $$f $(baseboards_dest); \
        done
-       $(INSTALL_DATA) $(srcdir)/dejagnu.h $(includedir); \
+       $(INSTALL_DATA) $(srcdir)/dejagnu.h $(include_dest)
        $(mkinstalldirs) $(config_dest)
        for f in $(config_files); do \
          test ! -f "$$f" || $(INSTALL_DATA) $$f $(config_dest); \
@@ -190,7 +192,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...'