From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17314 invoked by alias); 11 Apr 2008 22:03:23 -0000 Received: (qmail 17287 invoked by uid 367); 11 Apr 2008 22:03:22 -0000 Date: Fri, 11 Apr 2008 22:03:00 -0000 Message-ID: <20080411220322.17272.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Use $(libdir) instead of a hardwired path. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9896ef5e468ee7c40d9466cea704cc54a6f24e76 X-Git-Newrev: 9ba7717362d7e1868e51711d4864149fd5c9eb29 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-q2/txt/msg00086.txt.bz2 The branch, master has been updated via 9ba7717362d7e1868e51711d4864149fd5c9eb29 (commit) from 9896ef5e468ee7c40d9466cea704cc54a6f24e76 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 9ba7717362d7e1868e51711d4864149fd5c9eb29 Author: Andrew Cagney Date: Fri Apr 11 18:02:17 2008 -0400 Use $(libdir) instead of a hardwired path. frysk-sys/ChangeLog 2008-04-11 Andrew Cagney * Makefile.in (JniRunner): Use $(libdir). ----------------------------------------------------------------------- Summary of changes: frysk-sys/ChangeLog | 2 ++ frysk-sys/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-sys/ChangeLog b/frysk-sys/ChangeLog index 5d3f86b..4ee4dcb 100644 --- a/frysk-sys/ChangeLog +++ b/frysk-sys/ChangeLog @@ -1,5 +1,7 @@ 2008-04-11 Andrew Cagney + * Makefile.in (JniRunner): Use $(libdir). + * Makefile.am (JniRunner.jar): Use $(JAR), not jar. * Makefile.am (JniRunner.jar): Force frysk-sys.jar into JAVAC's diff --git a/frysk-sys/Makefile.am b/frysk-sys/Makefile.am index 01e436c..e0730e6 100644 --- a/frysk-sys/Makefile.am +++ b/frysk-sys/Makefile.am @@ -80,7 +80,7 @@ CLEANFILES += JniRunner JniRunner: rm -f $@.tmp echo "#!/bin/sh" >> $@.tmp - echo "LD_PRELOAD=/usr/lib/libstdc++.so.6 \\" >> $@.tmp + echo "LD_PRELOAD=$(libdir)/libstdc++.so.6 \\" >> $@.tmp echo "LD_LIBRARY_PATH=. \\" >> $@.tmp echo "CLASSPATH=$(CLASSPATH):frysk-sys.jar:JniRunner.jar \\" >> $@.tmp echo "java JniRunner \"$$@\"" >> $@.tmp hooks/post-receive -- frysk system monitor/debugger