From cebef70d9071eac41765ecc322cd863368fc737f Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 25 May 2001 01:20:51 +0000 Subject: One last structural change. Install header files to INSTALLDIR/usr/include so we now parallel the behavior of the standard tools. Also make sure we check INSTALLDIR/lib and INSTALLDIR/usr/lib for libraries. -Erik --- ldso/config.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'ldso/config.h') diff --git a/ldso/config.h b/ldso/config.h index 1d1429dc1..26171138d 100644 --- a/ldso/config.h +++ b/ldso/config.h @@ -4,18 +4,12 @@ # define LDSO_CACHE "../util/ld.so.cache" # define LDSO_PRELOAD "../util/ld.so.preload" # define LDDSTUB "../util/lddstub" -#elif UCLIBC_DEVEL +#else # define LDSO_IMAGE UCLIBC_INSTALL_DIR"/lib/ld.so" # define LDSO_CONF UCLIBC_INSTALL_DIR"/etc/ld.so.conf" # define LDSO_CACHE UCLIBC_INSTALL_DIR"/etc/ld.so.cache" # define LDSO_PRELOAD UCLIBC_INSTALL_DIR"/etc/ld.so.preload" -# define LDDSTUB UCLIBC_INSTALL_DIR"/lib/lddstub" -#else -# define LDSO_IMAGE "/lib/ld.so" -# define LDSO_CONF "/etc/ld.so.conf" -# define LDSO_CACHE "/etc/ld.so.cache" -# define LDSO_PRELOAD "/etc/ld.so.preload" -# define LDDSTUB "/usr/lib/lddstub" +# define LDDSTUB UCLIBC_INSTALL_DIR"/usr/lib/lddstub" #endif #define LDD_ARGV0 "__LDD_ARGV0" -- cgit v1.2.3