2002-11-12 Peter Breitenlohner <peb@mppmu.mpg.de>

	* Makefile.am: Add support for DESTDIR.
	* Makefile.in: Regenerated.

4 files changed, 27 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index c68db5f..6c05c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-11-12  Peter Breitenlohner <peb@mppmu.mpg.de>
+
+	* Makefile.am: Add support for DESTDIR.
+	* Makefile.in: Regenerated.
+
+2002-10-21  Matt Bemis  <bemis@iol.unh.edu>
+       * added input/output to xml_output in lib/framework.exp
+       * removed the log feature replaced by input/output_xml
+
+2002-09-24  Richard Earnshaw  <rearnsha@arm.com>
+
+        * lib/libgloss.exp (build_wrapper): Use a tool-specific filename on
+        the host for the testglue.
+
 2002-09-04  Rob Savoye  <rob@welcomehome.org>
 
 	* Clean.tcl (cleanfiles): Add more patterns to remove.
diff --git a/Makefile.am b/Makefile.am
index 940878a..dbb12ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,11 +158,13 @@ lib_files = $(srcdir)/*.c $(srcdir)/lib/*.exp
 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...'
diff --git a/Makefile.in b/Makefile.in
index e624452..a76f1bb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -120,6 +120,7 @@ lib_files = $(srcdir)/*.c $(srcdir)/lib/*.exp
 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
 subdir = .
@@ -550,7 +551,7 @@ snapshot:
 	src=$(srcdir); \
 	dir=`(cd $${src}; pwd)`; \
 	(cd dejagnu-${DATE} ; $${dir}/Clean.tcl);
-	-mkdir -p doc/overview
+	-mkdir -p doc/html
 	-cp -fr doc/html dejagnu-${DATE}/doc/
 	-cp -fr doc/overview.ps dejagnu-${DATE}/doc/
 	-cp -fr doc/overview.pdf dejagnu-${DATE}/doc/
@@ -632,7 +633,7 @@ dist-hook: rpmspec overview.html overview.ps overview.pdf
 	-cp -fr doc/overview.pdf $(distdir)/doc/
 
 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
@@ -640,7 +641,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); \
@@ -660,7 +661,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 --git a/doc/Makefile.in b/doc/Makefile.in
index 99b8572..21ed404 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -293,7 +293,9 @@ docs: $(TARGETS)
 # now for some extra dependencies that the automatic rules will not
 # catch:
 
-html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml 
+html/book1.html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml 
+
+html/book1.html: overview.sgml ref.sgml user.sgml 
 
 clean realclean distclean:
 	rm -fr $(TARGETS) DBHTOHTML* html dejagnu.info* overview.junk overview overview.{aux,dvi,log,ps,pdf,tex}