diff options
author | kan <kan@FreeBSD.org> | 2004-07-28 03:11:36 +0000 |
---|---|---|
committer | kan <kan@FreeBSD.org> | 2004-07-28 03:11:36 +0000 |
commit | 5e00ec74d8ce58f99801200d4d3d0412c7cc1b28 (patch) | |
tree | 052f4bb635f2bea2c5e350bd60c902be100a0d1e /contrib/gcc/mkheaders.in | |
parent | 87b8398a7d9f9bf0e28bbcd54a4fc27db2125f38 (diff) | |
download | FreeBSD-src-5e00ec74d8ce58f99801200d4d3d0412c7cc1b28.zip FreeBSD-src-5e00ec74d8ce58f99801200d4d3d0412c7cc1b28.tar.gz |
Gcc 3.4.2 20040728.
Diffstat (limited to 'contrib/gcc/mkheaders.in')
-rw-r--r-- | contrib/gcc/mkheaders.in | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/contrib/gcc/mkheaders.in b/contrib/gcc/mkheaders.in index a97c49e..23cb931 100644 --- a/contrib/gcc/mkheaders.in +++ b/contrib/gcc/mkheaders.in @@ -21,7 +21,7 @@ # Basic information target=@target@ -target_alias=@target_alias@ +target_noncanonical=@target_noncanonical@ version=@gcc_version@ VERBOSE=0 @@ -64,18 +64,22 @@ local_prefix=@local_prefix@ exec_prefix=@exec_prefix@ # Directory in which to put the directories used by the compiler. libdir=@libdir@ -# Directory in which the compiler finds executables, libraries, etc. -libsubdir=${libdir}/gcc-lib/${target_alias}/${version} +libexecdir=@libexecdir@ +# Directory in which the compiler finds libraries, etc. +libsubdir=${libdir}/gcc-lib/${target_noncanonical}/${version} +# Directory in which the compiler finds executables +libexecsubdir=${libexecdir}/gcc/${target_noncanonical}/${version} # Since gcc_tooldir does not exist at build-time, use -B${build_tooldir}/bin/ -build_tooldir=${exec_prefix}/${target_alias} +build_tooldir=${exec_prefix}/${target_noncanonical} # Directory to search for site-specific includes. local_includedir=${local_prefix}/include includedir=${prefix}/include -itoolsdir=${libsubdir}/install-tools +itoolsdir=${libexecsubdir}/install-tools +itoolsdatadir=${libsubdir}/install-tools incdir=${libsubdir}/include -. ${itoolsdir}/mkheaders.conf +. ${itoolsdatadir}/mkheaders.conf cd ${itoolsdir} rm -rf ${incdir}/* @@ -88,11 +92,11 @@ if [ x${STMP_FIXINC} != x ] ; then if [ -f ${incdir}/limits.h ]; then mv ${incdir}/limits.h ${incdir}/syslimits.h else - cp gsyslimits.h ${incdir}/syslimits.h + cp ${itoolsdatadir}/gsyslimits.h ${incdir}/syslimits.h fi fi -cp include/* ${incdir} +cp ${itoolsdatadir}/include/* ${incdir} if [ x${STMP_FIXPROTO} != x ] ; then mkinstalldirs="${SHELL} ${itoolsdir}/mkinstalldirs" |