From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30779 invoked by alias); 3 Oct 2002 18:20:48 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 30760 invoked from network); 3 Oct 2002 18:20:47 -0000 Received: from unknown (HELO nerodeguest) (24.161.107.98) by sources.redhat.com with SMTP; 3 Oct 2002 18:20:47 -0000 Received: from neroden by nerodeguest with local (Exim 3.36 #1 (Debian)) id 17xAWY-0005Xu-00; Thu, 03 Oct 2002 14:16:34 -0400 Date: Thu, 03 Oct 2002 11:20:00 -0000 To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com, binutils@sources.redhat.com, dj@redhat.com Subject: toplevel: make more things look more autoconfy Message-ID: <20021003181634.GA21314@doctormoo.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i From: Nathanael Nerode X-SW-Source: 2002-10/txt/msg00110.txt.bz2 Tested by configuring on i686-pc-linux-gnu, successful. * Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy. * configure.in: Make RPATH_ENVVAR substitution more autoconfy. * Makefile.in: Regenerate. Index: Makefile.in =================================================================== RCS file: /cvs/gcc/gcc/Makefile.in,v retrieving revision 1.123 diff -u -r1.123 Makefile.in --- Makefile.in 2 Oct 2002 19:12:43 -0000 1.123 +++ Makefile.in 3 Oct 2002 18:18:08 -0000 @@ -205,7 +205,7 @@ # This is the name of the environment variable used for the path to # the libraries. This may be changed by configure.in. -RPATH_ENVVAR = LD_LIBRARY_PATH +RPATH_ENVVAR = @RPATH_ENVVAR@ # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the host machine work. Index: Makefile.tpl =================================================================== RCS file: /cvs/gcc/gcc/Makefile.tpl,v retrieving revision 1.9 diff -u -r1.9 Makefile.tpl --- Makefile.tpl 2 Oct 2002 19:12:43 -0000 1.9 +++ Makefile.tpl 3 Oct 2002 18:18:10 -0000 @@ -208,7 +208,7 @@ # This is the name of the environment variable used for the path to # the libraries. This may be changed by configure.in. -RPATH_ENVVAR = LD_LIBRARY_PATH +RPATH_ENVVAR = @RPATH_ENVVAR@ # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the host machine work. Index: configure.in =================================================================== RCS file: /cvs/gcc/gcc/configure.in,v retrieving revision 1.185 diff -u -r1.185 configure.in --- configure.in 30 Sep 2002 12:15:00 -0000 1.185 +++ configure.in 3 Oct 2002 18:18:11 -0000 @@ -1325,16 +1325,17 @@ Makefile > Makefile.tem rm -f Makefile mv -f Makefile.tem Makefile - - case "${host}" in - *-*-hpux*) - sed -e 's/^RPATH_ENVVAR[ ]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \ - Makefile > Makefile.tem - rm -f Makefile - mv -f Makefile.tem Makefile - ;; - esac fi + + +case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; +esac +sed -e "s/@RPATH_ENVVAR@/${RPATH_ENVVAR}/" Makefile > Makefile.tem +rm -f Makefile +mv -f Makefile.tem Makefile + # Base args. Strip norecursion, cache-file, srcdir, host, build, target. # These are the ones we might not want to pass down to subconfigures.