This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] [MELT] Fix installation of MELT modules
Path computation for installation in GCC's plugin/melt-modules/ path was
broken (in fact not updated to the latest changes). Present commit fixes
this by reading the link targets and installing them.
---
contrib/ChangeLog.MELT | 2 ++
contrib/MELT-Plugin-Makefile | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/contrib/ChangeLog.MELT b/contrib/ChangeLog.MELT
index 9b8123c..42f2aca 100644
--- a/contrib/ChangeLog.MELT
+++ b/contrib/ChangeLog.MELT
@@ -1,3 +1,5 @@
+2011-08-25 Alexandre Lissy <alissy@mandriva.com>
+ * MELT-Plugin-Makefile (install-melt-modules): Fix installation paths
2011-07-18 Basile Starynkevitch <basile@starynkevitch.net>
* MELT-Plugin-Makefile (melt_make_move): Use move-if-change.
diff --git a/contrib/MELT-Plugin-Makefile b/contrib/MELT-Plugin-Makefile
index 5e5baae..a4be1f0 100644
--- a/contrib/MELT-Plugin-Makefile
+++ b/contrib/MELT-Plugin-Makefile
@@ -288,13 +288,13 @@ install-melt-sources: melt-sources melt-all-sources
### phony makefile target from melt-build.mk
install-melt-modules: melt-modules melt-all-modules
$(mkinstalldirs) $(DESTDIR)/$(melt_module_dir)
- for d in $(wildcard melt-modules/*); do \
- $(mkinstalldirs) $(DESTDIR)/$(melt_module_dir)/`basename $$d` ; \
- for f in $$d/*.so ; do \
- $(INSTALL_PROGRAM) $$f $(DESTDIR)/$(melt_module_dir)/`basename $$d`/`basename $$f ` ; \
- done; \
+ for l in $(wildcard melt-modules/*) : ; do \
+ if [ "$$l" != ":" ]; then \
+ $(INSTALL_PROGRAM) `readlink $$l` $(DESTDIR)$(melt_module_dir)/$$(basename `readlink $$l`) ; \
+ fi; \
done
+
## install the makefile for MELT modules
install-melt-mk: melt-module.mk
$(mkinstalldirs) $(DESTDIR)/$(libexecsubdir)