dejagnu-1.4.3 -- 'make DESTDIR=<some_where> install' failure + patch
Peter Breitenlohner <[email protected]>
| Newsgroups | gmane.comp.sysutils.dejagnu.bugs |
|---|---|
| Message-ID | <[email protected]> |
Hi, I was pleased to see that dejagnu-1.4.3 supports 'make DESTDIR=<some_where> install' but unfortunately only in principle. Attached please find a patch that fixes this problem. regards Peter Breitenlohner <[email protected]>
dejagnu-1.4.3-patch
(text/plain, 2.8 KB)
diff -ur dejagnu-1.4.3.orig/Makefile.am dejagnu-1.4.3/Makefile.am --- dejagnu-1.4.3.orig/Makefile.am 2002-09-04 22:36:08.000000000 +0200 +++ dejagnu-1.4.3/Makefile.am 2002-10-25 15:16:23.000000000 +0200 @@ -158,11 +158,13 @@ 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 @@ 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 @@ 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 -ur dejagnu-1.4.3.orig/Makefile.in dejagnu-1.4.3/Makefile.in --- dejagnu-1.4.3.orig/Makefile.in 2002-09-04 22:41:13.000000000 +0200 +++ dejagnu-1.4.3/Makefile.in 2002-10-25 15:16:27.000000000 +0200 @@ -120,6 +120,8 @@ 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 = . @@ -632,7 +634,7 @@ -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 +642,7 @@ 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 +662,7 @@ 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...'