From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26815 invoked by alias); 1 Feb 2008 02:12:21 -0000 Received: (qmail 26790 invoked by uid 440); 1 Feb 2008 02:12:20 -0000 Date: Fri, 01 Feb 2008 02:12:00 -0000 Message-ID: <20080201021220.26775.qmail@sourceware.org> From: scox@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Consider DESTDIR and ARCH32 when installing test-sysroot. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3f77e12c3116c763bea37e0b56d82862f22dcada X-Git-Newrev: fa49857140a9ea0d2346fa8d4d7ffc1d41d5c22d Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00147.txt.bz2 The branch, master has been updated via fa49857140a9ea0d2346fa8d4d7ffc1d41d5c22d (commit) from 3f77e12c3116c763bea37e0b56d82862f22dcada (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit fa49857140a9ea0d2346fa8d4d7ffc1d41d5c22d Author: Stan Cox Date: Thu Jan 31 20:50:01 2008 -0500 Consider DESTDIR and ARCH32 when installing test-sysroot. * Makefile.am (install-sysroot-local): Use DESTDIR, consider ARCH32. ----------------------------------------------------------------------- Summary of changes: frysk-core/ChangeLog | 4 ++++ frysk-core/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) First 500 lines of diff: diff --git a/frysk-core/ChangeLog b/frysk-core/ChangeLog index a2a2897..473ac9f 100644 --- a/frysk-core/ChangeLog +++ b/frysk-core/ChangeLog @@ -1,3 +1,7 @@ +2008-01-31 Stan Cox + + * Makefile.am (install-sysroot-local): Use DESTDIR, consider ARCH32. + 2008-01-29 Stan Cox * Makefile.am (pkglib_PROGRAMS): Add funit-addresses-stripped. diff --git a/frysk-core/Makefile.am b/frysk-core/Makefile.am index 7349087..2b43577 100644 --- a/frysk-core/Makefile.am +++ b/frysk-core/Makefile.am @@ -243,8 +243,10 @@ install-exec-local: install-sysroot-local uninstall-local: uninstall-sysroot-local .PHONY: install-sysroot-local uninstall-sysroot-local install-sysroot-local: - cp -r frysk/pkglibdir/test-sysroot $(pkglibdir) - cp -r frysk/pkglibdir/arch32/test-sysroot $(pkglib32dir) + cp -r frysk/pkglibdir/test-sysroot $(DESTDIR)$(pkglibdir) +if DO_ARCH32_TEST + cp -r frysk/pkglibdir/arch32/test-sysroot $(DESTDIR)$(pkglib32dir) +endif # we don't want this installed, but noinst_SCRIPTS has no effect rm -f $(libdir)/frysk/gen-type-funit-tests uninstall-sysroot-local: hooks/post-receive -- frysk system monitor/debugger