* dejagnu : runtest.exp wrong installed
@ 1997-10-10 7:00 Philippe De Muyter
1997-10-10 8:51 ` Ian Lance Taylor
0 siblings, 1 reply; 3+ messages in thread
From: Philippe De Muyter @ 1997-10-10 7:00 UTC (permalink / raw)
To: egcs mailing list
With dejagnu-971006, make install installs all dejagnu's data files
in /usr/local/share, not in /usr/local/share/dejagnu as runtest expects
them. The problem seems to be that dejagnu/Makefile tries to define
datadir as ${prefix}/share/dejagnu, but is invoked with
datadir=${prefix}/share. What's the proper way to fix that ?
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: dejagnu : runtest.exp wrong installed
1997-10-10 7:00 dejagnu : runtest.exp wrong installed Philippe De Muyter
@ 1997-10-10 8:51 ` Ian Lance Taylor
1997-10-12 13:26 ` Philippe De Muyter
0 siblings, 1 reply; 3+ messages in thread
From: Ian Lance Taylor @ 1997-10-10 8:51 UTC (permalink / raw)
To: phdm; +Cc: egcs
Date: Fri, 10 Oct 1997 09:48:49 +0200 (MET DST)
From: "Philippe De Muyter" <phdm@mail.macqel.be>
With dejagnu-971006, make install installs all dejagnu's data files
in /usr/local/share, not in /usr/local/share/dejagnu as runtest expects
them. The problem seems to be that dejagnu/Makefile tries to define
datadir as ${prefix}/share/dejagnu, but is invoked with
datadir=${prefix}/share. What's the proper way to fix that ?
The definition in dejagnu is wrong. In dejagnu/Makefile.in, I see
datadir = @datadir@/dejagnu
Setting the make variable datadir to anything other than @datadir@ is
a sure sign that something is screwy.
Probably all instances of datadir in dejagnu/Makefile.in should be
changed to something else. Here's an untested sample patch. Let me
know if it does the right thing.
Ian
Index: Makefile.in
===================================================================
RCS file: /cvs/cvsfiles/devo/dejagnu/Makefile.in,v
retrieving revision 1.56
diff -u -r1.56 Makefile.in
--- Makefile.in 1997/05/18 02:12:57 1.56
+++ Makefile.in 1997/10/10 15:26:49
@@ -26,7 +26,7 @@
bindir = @bindir@
libdir = @libdir@
-datadir = @datadir@/dejagnu
+dejadatadir = @datadir@/dejagnu
infodir = @infodir@
includedir = @includedir@
gxx_includedir = $(tooldir)/g++-include
@@ -96,21 +96,21 @@
$(MAKE) subdir_do DO=install-info $(FLAGS_TO_PASS)
install:
- ${srcdir}/mkinstalldirs $(bindir) $(datadir) $(datadir)/baseboards $(datadir)/config
+ ${srcdir}/mkinstalldirs $(bindir) $(dejadatadir) $(dejadatadir)/baseboards $(dejadatadir)/config
$(INSTALL_PROGRAM) $(srcdir)/runtest $(bindir)/runtest
- $(INSTALL_PROGRAM) $(srcdir)/runtest.exp $(datadir)/runtest.exp
- $(INSTALL_PROGRAM) $(srcdir)/../config.guess $(datadir)/config.guess
+ $(INSTALL_PROGRAM) $(srcdir)/runtest.exp $(dejadatadir)/runtest.exp
+ $(INSTALL_PROGRAM) $(srcdir)/../config.guess $(dejadatadir)/config.guess
-for file in $(srcdir)/lib/*.exp $(srcdir)/*.c; \
do \
- $(INSTALL_DATA) $$file $(datadir) ; \
+ $(INSTALL_DATA) $$file $(dejadatadir) ; \
done
-for file in $(srcdir)/baseboards/*.exp $(srcdir)/baseboards/README; \
do \
- $(INSTALL_DATA) $$file $(datadir)/baseboards ; \
+ $(INSTALL_DATA) $$file $(dejadatadir)/baseboards ; \
done
-for file in $(srcdir)/config/*.exp $(srcdir)/config/README; \
do \
- $(INSTALL_DATA) $$file $(datadir)/config ; \
+ $(INSTALL_DATA) $$file $(dejadatadir)/config ; \
done
@$(MAKE) subdir_do DO=install $(FLAGS_TO_PASS)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~1997-10-12 13:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
1997-10-10 7:00 dejagnu : runtest.exp wrong installed Philippe De Muyter
1997-10-10 8:51 ` Ian Lance Taylor
1997-10-12 13:26 ` Philippe De Muyter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).