Re: [PATCH] Add support for DESTDIR to the simulator core

Daniel Jacobowitz
2005-05-18T01:55:17Z

On Tue, May 10, 2005 at 04:53:36PM -0400, Daniel Jacobowitz wrote:
> The other two patches did not modify FLAGS_TO_PASS; is this really
> necessary? I don't believe it is.

I didn't get an answer to this so I am going to assume that it isn't.

None of the three submitted versions of this patch had a correct
ChangeLog, so I redid it myself. Thank you all for reporting the
problem.

--
Daniel Jacobowitz
CodeSourcery, LLC

2005-05-17 Daniel Jacobowitz <dan@codesourcery.com>

* Make-common.in (install-common, installdirs): Honor $DESTDIR.

Index: Make-common.in
===================================================================
RCS file: /cvs/src/src/sim/common/Make-common.in,v
retrieving revision 1.21
diff -u -p -r1.21 Make-common.in
--- Make-common.in 27 Apr 2005 20:38:08 -0000 1.21
+++ Make-common.in 18 May 2005 01:54:13 -0000
@@ -616,14 +616,14 @@ install: install-common $(SIM_EXTRA_INST

install-common: installdirs
n=`echo run | sed '$(program_transform_name)'`; \
- $(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n$(EXEEXT)
+ $(INSTALL_PROGRAM) run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \
- $(INSTALL_DATA) libsim.a $(libdir)/$$n ; \
- ( cd $(libdir) ; $(RANLIB) $$n )
+ $(INSTALL_DATA) libsim.a $(DESTDIR)$(libdir)/$$n ; \
+ ( cd $(DESTDIR)$(libdir) ; $(RANLIB) $$n )

installdirs:
- $(SHELL) $(srcdir)/../../mkinstalldirs $(bindir)
- $(SHELL) $(srcdir)/../../mkinstalldirs $(libdir)
+ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir)
+ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir)

check:
cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)"