[PATCH] Add missing DESTDIR to dejagnu

[PATCH] Add missing DESTDIR to dejagnu

[Martin Koegler]

sourceware.org contains in the src-tree an older version of dejagnu.
DESTDIR works for all files, except dejagnu.h, because it is not installed
with the means of automake.

The following patch make the makefile honor the DESTDIR setting also
for dejagnu.h. (Makefile.in needs to be regenerated)

2005-05-26  Martin Koegler  <mkoegler@auto.tuwien.ac.at>

        * Makefile.am: Honor $DESTDIR for dejagnu.h

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/dejagnu/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- Makefile.am	10 Nov 2003 09:14:46 -0000	1.4
+++ Makefile.am	26 May 2005 13:12:19 -0000
@@ -124,7 +124,7 @@
 uninstall-info:
 
 install-data-local:
-	$(mkinstalldirs) $(lib_dest) $(includedir)
+	$(mkinstalldirs) $(lib_dest) $(DESTDIR)$(includedir)
 	for f in $(lib_files); do \
 	  test ! -f "$$f" || $(INSTALL_DATA) $$f $(lib_dest); \
 	done
@@ -134,7 +134,7 @@
 	  test ! -f "$$f" || $(INSTALL_DATA) $$f $(baseboards_dest); \
 	done
 	#
-	$(INSTALL_DATA) $(srcdir)/dejagnu.h $(includedir); \
+	$(INSTALL_DATA) $(srcdir)/dejagnu.h $(DESTDIR)$(includedir); \
 	#
 	$(mkinstalldirs) $(config_dest)
 	for f in $(config_files); do \
@@ -155,7 +155,7 @@
 	for f in $(baseboards_files); do \
 	  test ! -f "$$f" || rm -f $(baseboards_dest)/`basename "$$f"`; \
 	done
-	rm -f $(includedir)/dejagnu.h;
+	rm -f $(DESTDIR)$(includedir)/dejagnu.h;
 
 site.exp: Makefile
 	@echo 'Making a new site.exp file...'


Is it possible to apply the patch to the CVS?

mfg Martin Kögler
e9925248@stud4.tuwien.ac.at

Re: [PATCH] Add missing DESTDIR to dejagnu

[Nick Clifton]

Hi Martin,

> 2005-05-26  Martin Koegler  <mkoegler@auto.tuwien.ac.at>
> 
>         * Makefile.am: Honor $DESTDIR for dejagnu.h

Approved and applied.  (Plus I did regenerate Makefile.in and check this 
in as well).

Cheers
   Nick