diff options
| author | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-31 23:36:43 +0000 |
|---|---|---|
| committer | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-31 23:36:43 +0000 |
| commit | 9db45a8782bac6d4cf769d2373f51f197c4ebc12 (patch) | |
| tree | 63caf2b661d8c3bfb8d246a2225e369bec17c8a1 /gcc/mkheaders.in | |
| parent | 3f2444de90f3f512bf0525c57223247f515f95b2 (diff) | |
| download | ppe42-gcc-9db45a8782bac6d4cf769d2373f51f197c4ebc12.tar.gz ppe42-gcc-9db45a8782bac6d4cf769d2373f51f197c4ebc12.zip | |
2003-07-31 Geoffrey Keating <geoffk@apple.com>
* Makefile.tpl (libsubdir): Use gcc instead of gcc-lib.
* Makefine.in: Update.
Index: gcc/ChangeLog
2003-07-31 Geoffrey Keating <geoffk@apple.com>
* Makefile.in (libexecdir): New.
(libsubdir): Use gcc instead of gcc-lib.
(libexecsubdir): New.
(ORDINARY_FLAGS_TO_PASS): Add libexecsubdir.
(DRIVER_DEFINES): Add STANDARD_LIBEXEC_PREFIX, use gcc instead of
gcc-lib.
(installdirs): Make libexecsubdir.
(install-common): Put executables in libexecsubdir.
(itoolsdir): Use libexecsubdir.
(itoolsdatadir): New.
(install-mkheaders): Separate data files and executables.
(install-collect2): Put executables in libexecsubdir.
(uninstall): Remove libexecsubdir.
* mkheaders.in: Update for new arrangement of files.
(libexecdir): New.
(libexecsubdir): New.
(itoolsdir): Use libexecsubdir.
(itoolsdatadir): New.
* gcc.c (gcc_libexec_prefix): New.
(STANDARD_LIBEXEC_PREFIX): Use gcc instead of gcc-lib.
(standard_exec_prefix_1): Use libexec.
(standard_exec_prefix_2): New.
(standard_libexec_prefix): New.
(process_command): Update for new arrangement of files. Compute
gcc_libexec_prefix. Update for change from gcc-lib to gcc.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70024 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/mkheaders.in')
| -rw-r--r-- | gcc/mkheaders.in | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gcc/mkheaders.in b/gcc/mkheaders.in index a97c49edf59..1e36ca4f408 100644 --- a/gcc/mkheaders.in +++ b/gcc/mkheaders.in @@ -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. +libexecdir=@libexecdir@ +# Directory in which the compiler finds libraries, etc. libsubdir=${libdir}/gcc-lib/${target_alias}/${version} +# Directory in which the compiler finds executables +libexecsubdir=${libexecdir}/gcc/${target_alias}/${version} # Since gcc_tooldir does not exist at build-time, use -B${build_tooldir}/bin/ build_tooldir=${exec_prefix}/${target_alias} # 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" |
