diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2005-03-21 18:01:47 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2005-03-21 18:01:47 +0000 |
| commit | c69002727561c79e9cf16e165652a4bd99020611 (patch) | |
| tree | 41a18ed2fa949c517a1cd0712cf0493320dd6bc6 /libffi/include | |
| parent | 83310f568883d4daceeb365fe86d44cdb24110ce (diff) | |
| download | gcc-c69002727561c79e9cf16e165652a4bd99020611.tar.gz | |
configure.ac: Do not invoke TL_AC_GCC_VERSION.
* configure.ac: Do not invoke TL_AC_GCC_VERSION.
Do not set tool_include_dir.
* aclocal.m4, configure, Makefile.in, testsuite/Makefile.in:
Regenerate.
* include/Makefile.am: Set gcc_version and toollibffidir.
* include/Makefile.in: Regenerate.
From-SVN: r96823
Diffstat (limited to 'libffi/include')
| -rw-r--r-- | libffi/include/Makefile.am | 5 | ||||
| -rw-r--r-- | libffi/include/Makefile.in | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/libffi/include/Makefile.am b/libffi/include/Makefile.am index 048824d3938..0c160aadf5a 100644 --- a/libffi/include/Makefile.am +++ b/libffi/include/Makefile.am @@ -9,5 +9,8 @@ hackdir=$(includedir) hack_DATA= ffi.h -toollibffidir = @tool_include_dir@/libffi +# Where generated headers like ffitarget.h get installed. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/libffi + toollibffi_HEADERS = ffitarget.h diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in index a34f98e5f90..58122680250 100644 --- a/libffi/include/Makefile.in +++ b/libffi/include/Makefile.in @@ -43,7 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/ffi.h.in $(toollibffi_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \ - $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,9 +178,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ -gcc_version = @gcc_version@ -gcc_version_full = @gcc_version_full@ -gcc_version_trigger = @gcc_version_trigger@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -207,7 +203,6 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ AUTOMAKE_OPTIONS = foreign @@ -215,7 +210,10 @@ DISTCLEANFILES = ffitarget.h EXTRA_DIST = ffi.h.in ffi_common.h hackdir = $(includedir) hack_DATA = ffi.h -toollibffidir = @tool_include_dir@/libffi + +# Where generated headers like ffitarget.h get installed. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/libffi toollibffi_HEADERS = ffitarget.h all: all-am |