diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-07-30 10:52:08 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-07-30 10:52:08 +0000 |
| commit | 9bb2ed7f090f9ed23d0e243d1771ecd8edf8dda2 (patch) | |
| tree | 87388cf68f632782af06c7348b95259bd4e6f0f9 /gcc/Makefile.in | |
| parent | 479378977eca81cb3045a7a2f21f0384feed8239 (diff) | |
| download | gcc-9bb2ed7f090f9ed23d0e243d1771ecd8edf8dda2.tar.gz | |
[gcc/]
2012-07-30 Basile Starynkevitch <basile@starynkevitch.net>
* melt-module.mk (GCCMELT_HEADER_DIR, GCCMELT_PREPROFLAGS): New
variables.
* Makefile.in: Use melt-headers/$(melt_version_string).
(install-melt-mk): Overwrite GCCMELT_HEADER_DIR at installation.
[contrib/]
2012-07-30 Basile Starynkevitch <basile@starynkevitch.net>
* MELT-Plugin-Makefile: the melt headers directory is melt-headers/$(melt_version_string).
(install-melt-mk): Change the GCCMELT_HEADER_DIR at installation.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@189968 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index fc138244f26..9dae5e3c327 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -5393,7 +5393,7 @@ melt_source_dir=$(libexecsubdir)/melt-sources/$(melt_version_string) ## this is the installation directory of MELT header files -melt_header_dir=$(plugin_includedir)/melt-headers-$(melt_version_string) +melt_header_dir=$(plugin_includedir)/melt-headers/$(melt_version_string) ## this is the installation directory of melt dynamic modules (*.so) and module list melt_module_dir=$(libexecsubdir)/melt-modules/$(melt_version_string) @@ -5484,7 +5484,7 @@ melt-build-param.sh: Makefile echo '## GCCMELT_INSTALL_SOURCEDIR is the installed MELT source directory' >> $@-tmp echo 'GCCMELT_INSTALL_SOURCEDIR=$(libexecsubdir)/melt-sources/$(melt_version_string)' >> $@-tmp echo '## GCCMELT_INSTALL_HEADERDIR is the installed MELT headers directory' >> $@-tmp - echo 'GCCMELT_INSTALL_HEADERDIR=$(plugin_includedir)/melt-headers-$(melt_version_string)' >> $@-tmp + echo 'GCCMELT_INSTALL_HEADERDIR=$(plugin_includedir)/melt-headers/$(melt_version_string)' >> $@-tmp echo '## GCCMELT_INSTALL_MODULEDIR is the installed MELT module directory' >> $@-tmp echo 'GCCMELT_INSTALL_MODULEDIR=$(libexecsubdir)/melt-modules/$(melt_version_string)' >> $@-tmp echo '## GCCMELT_INSTALL_MODULEMK is the installed MELT module makefile' >> $@-tmp @@ -5550,10 +5550,12 @@ install-melt-modules: melt-modlists done -## install the makefile for MELT modules +## install the makefile for MELT modules, updating the GCCMELT_HEADER_DIR there install-melt-mk: melt-module.mk + sed -e 's/GCCMELT_HEADER_DIR=./GCCMELT_HEADER_DIR=$(melt_header_dir)' < $< > melt-module.mk-tmp $(mkinstalldirs) $(DESTDIR)$(libexecsubdir) - $(INSTALL_DATA) $< $(DESTDIR)/$(melt_installed_module_makefile) + $(INSTALL_DATA) melt-module.mk-tmp $(DESTDIR)/$(melt_installed_module_makefile) + $(RM) melt-module.mk-tmp ## install the default modules list install-melt-default-modules-list: melt-modlists |