Removing useless slashes in path to avoid issues when RPM extracts debug
informations.
---
contrib/ChangeLog.MELT | 3 +++
contrib/MELT-Plugin-Makefile | 30 +++++++++++++++---------------
gcc/ChangeLog.MELT | 3 +++
gcc/melt-module.mk | 8 ++++----
4 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/contrib/ChangeLog.MELT b/contrib/ChangeLog.MELT
index 953fb65..0b63775 100644
--- a/contrib/ChangeLog.MELT
+++ b/contrib/ChangeLog.MELT
@@ -1,4 +1,7 @@
2011-08-25 Alexandre Lissy <ali...@mandriva.com>
+ * MELT-Plugin-Makefile: Remove useless '/' after $(DESTDIR)
+
+2011-08-25 Alexandre Lissy <ali...@mandriva.com>
* meltpluginapi.texi: Adding missing versionsubtitle macro
2011-08-25 Alexandre Lissy <ali...@mandriva.com>
diff --git a/contrib/MELT-Plugin-Makefile b/contrib/MELT-Plugin-Makefile
index 8625c09..0609cd5 100644
--- a/contrib/MELT-Plugin-Makefile
+++ b/contrib/MELT-Plugin-Makefile
@@ -275,28 +275,28 @@ install: all melt.so warmelt \
install-melt-mk install-melt-default-modules-list install-melt-so
install-melt-includes: melt-runtime.h melt-predef.h melt-run.h melt-run-md5.h melt/generated/meltrunsup.h
- $(mkinstalldirs) $(DESTDIR)/$(MELTGCC_PLUGIN_DIR)/include/
+ $(mkinstalldirs) $(DESTDIR)$(MELTGCC_PLUGIN_DIR)/include/
for f in $^; do \
- $(INSTALL_DATA) $$f $(DESTDIR)/$(MELTGCC_PLUGIN_DIR)/include/ ; \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(MELTGCC_PLUGIN_DIR)/include/ ; \
done
install-melt-so: melt.so
- $(INSTALL_PROGRAM) $< $(DESTDIR)/$(MELTGCC_PLUGIN_DIR)/melt.so
+ $(INSTALL_PROGRAM) $< $(DESTDIR)$(MELTGCC_PLUGIN_DIR)/melt.so
### notice that melt-sources is a directory, but melt-all-sources is a
### phony makefile target from melt-build.mk
install-melt-sources: melt-sources melt-all-sources
- $(mkinstalldirs) $(DESTDIR)/$(melt_source_dir)
+ $(mkinstalldirs) $(DESTDIR)$(melt_source_dir)
for f in melt-sources/*.c melt-sources/*.melt ; do \
- $(INSTALL_DATA) $$f $(DESTDIR)/$(melt_source_dir) ; \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(melt_source_dir) ; \
done
### notice that melt-modules is a directory, but melt-all-modules is a
### phony makefile target from melt-build.mk
install-melt-modules: melt-modules melt-all-modules
- $(mkinstalldirs) $(DESTDIR)/$(melt_module_dir)
+ $(mkinstalldirs) $(DESTDIR)$(melt_module_dir)
for l in $(wildcard melt-modules/*) : ; do \
if [ "$$l" != ":" ]; then \
$(INSTALL_PROGRAM) `readlink $$l` $(DESTDIR)$(melt_module_dir)/$$(basename `readlink $$l`) ; \
@@ -306,18 +306,18 @@ install-melt-modules: melt-modules melt-all-modules
## install the makefile for MELT modules
install-melt-mk: melt-module.mk
- $(mkinstalldirs) $(DESTDIR)/$(libexecsubdir)
- $(INSTALL_DATA) $< $(DESTDIR)/$(melt_installed_module_makefile)
+ $(mkinstalldirs) $(DESTDIR)$(libexecsubdir)
+ $(INSTALL_DATA) $< $(DESTDIR)$(melt_installed_module_makefile)
## install the default modules list
install-melt-default-modules-list: $(melt_default_modules_list).modlis
- $(INSTALL_DATA) $< $(DESTDIR)/$(melt_module_dir)
+ $(INSTALL_DATA) $< $(DESTDIR)$(melt_module_dir)
### install the MELT documentation files
install-melt-doc: doc doc-info doc-pdf doc-html
- $(mkinstalldirs) $(DESTDIR)/$(MELTGCC_DOC_INFO_DIR)
- $(INSTALL_DATA) *.info *.info-*[0-9] $(DESTDIR)/$(MELTGCC_DOC_INFO_DIR)
- $(mkinstalldirs) $(DESTDIR)/$(MELTGCC_DOC_HTML_DIR)
- $(INSTALL_DATA) *.html $(DESTDIR)/$(MELTGCC_DOC_HTML_DIR)
- $(mkinstalldirs) $(DESTDIR)/$(MELTGCC_DOC_PDF_DIR)
- $(INSTALL_DATA) *.pdf $(DESTDIR)/$(MELTGCC_DOC_PDF_DIR)
+ $(mkinstalldirs) $(DESTDIR)$(MELTGCC_DOC_INFO_DIR)
+ $(INSTALL_DATA) *.info *.info-*[0-9] $(DESTDIR)$(MELTGCC_DOC_INFO_DIR)
+ $(mkinstalldirs) $(DESTDIR)$(MELTGCC_DOC_HTML_DIR)
+ $(INSTALL_DATA) *.html $(DESTDIR)$(MELTGCC_DOC_HTML_DIR)
+ $(mkinstalldirs) $(DESTDIR)$(MELTGCC_DOC_PDF_DIR)
+ $(INSTALL_DATA) *.pdf $(DESTDIR)$(MELTGCC_DOC_PDF_DIR)
diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT
index ceb0d04..3379208 100644
--- a/gcc/ChangeLog.MELT
+++ b/gcc/ChangeLog.MELT
@@ -1,4 +1,7 @@
2011-08-25 Alexandre Lissy <ali...@mandriva.com>
+ * melt-module.mk: Remove double slashes (makes RPM unhappy)
+
+2011-08-25 Alexandre Lissy <ali...@mandriva.com>
* contrib/meltpluginapi.texi: Fix nodes (thanks to Patrice Dumas
<pertu...@free.fr>
diff --git a/gcc/melt-module.mk b/gcc/melt-module.mk
index ef2d07f..b0426f5 100644
--- a/gcc/melt-module.mk
+++ b/gcc/melt-module.mk
@@ -125,7 +125,7 @@ $(GCCMELT_MODULE_WORKSPACE)/%.optimized.pic.o:
echo optimized base3name at $(basename $(basename $(basename $@)))
echo optimized base4name at $(basename $(basename $(basename $(basename $@))))
$(GCCMELT_CC) -DMELTGCC_MODULE_OPTIMIZED -DMELT_HAVE_DEBUG=0 $(GCCMELT_OPTIMIZED_FLAGS) $(GCCMELT_CFLAGS) \
- -fPIC -c -o $@ $(patsubst %, $(GCCMELT_SOURCEDIR)/%.c, $(basename $(basename $(basename $(basename $(notdir $@))))))
+ -fPIC -c -o $@ $(patsubst %, $(GCCMELT_SOURCEDIR)%.c, $(basename $(basename $(basename $(basename $(notdir $@))))))
vpath %.quicklybuilt.pic.o $(GCCMELT_MODULE_WORKSPACE)
$(GCCMELT_MODULE_WORKSPACE)/%.quicklybuilt.pic.o:
@@ -141,7 +141,7 @@ $(GCCMELT_MODULE_WORKSPACE)/%.quicklybuilt.pic.o:
echo quicklybuilt base3name at $(basename $(basename $(basename $@)))
echo quicklybuilt base4name at $(basename $(basename $(basename $(basename $@))))
$(GCCMELT_CC) -DMELTGCC_MODULE_QUICKLYBUILT -DMELT_HAVE_DEBUG=1 $(GCCMELT_DEBUGNOLINE_FLAGS) $(GCCMELT_CFLAGS) \
- -fPIC -c -o $@ $(patsubst %, $(GCCMELT_SOURCEDIR)/%.c, $(basename $(basename $(basename $(basename $(notdir $@))))))
+ -fPIC -c -o $@ $(patsubst %, $(GCCMELT_SOURCEDIR)%.c, $(basename $(basename $(basename $(basename $(notdir $@))))))
vpath %.debugnoline.pic.o $(GCCMELT_MODULE_WORKSPACE)
$(GCCMELT_MODULE_WORKSPACE)/%.debugnoline.pic.o:
@@ -153,7 +153,7 @@ $(GCCMELT_MODULE_WORKSPACE)/%.debugnoline.pic.o:
GCCMELT_MODULE_FLAVOR=$(GCCMELT_MODULE_FLAVOR) \
GCCMELT_CUMULATED_MD5=$(GCCMELT_CUMULATED_MD5)
$(GCCMELT_CC) -DMELTGCC_MODULE_DEBUGNOLINE -DMELT_HAVE_DEBUG=1 $(GCCMELT_QUICKLYBUILT_FLAGS) $(GCCMELT_CFLAGS) \
- -fPIC -c -o $@ $(patsubst %, $(GCCMELT_SOURCEDIR)/%.c, $(basename $(basename $(basename $(basename $(notdir $@))))))
+ -fPIC -c -o $@ $(patsubst %, $(GCCMELT_SOURCEDIR)%.c, $(basename $(basename $(basename $(basename $(notdir $@))))))
vpath %.dynamic.pic.o $(GCCMELT_MODULE_WORKSPACE)
$(GCCMELT_MODULE_WORKSPACE)/%.dynamic.pic.o:
@@ -169,7 +169,7 @@ vpath %.dynamic.pic.o $(GCCMELT_MODULE_WORKSPACE)
echo dynamic base3name at $(basename $(basename $(basename $@)))
echo dynamic base4name at $(basename $(basename $(basename $(basename $@))))
$(GCCMELT_CC) -DMELTGCC_MODULE_DEBUGNOLINE -DMELT_HAVE_DEBUG=1 -DMELTGCC_DYNAMIC_OBJSTRUCT $(GCCMELT_DYNAMIC_FLAGS) $(GCCMELT_CFLAGS) \
- -fPIC -c -o $@ $(patsubst %, $(GCCMELT_SOURCEDIR)/%.c, $(basename $(basename $(basename $(basename $(notdir $@))))))
+ -fPIC -c -o $@ $(patsubst %, $(GCCMELT_SOURCEDIR)%.c, $(basename $(basename $(basename $(basename $(notdir $@))))))
$(GCCMELT_MODULE_WORKSPACE)/$(basename $(notdir $(GCCMELT_DESC))).$(GCCMELT_CUMULATED_MD5).pic.o: $(GCCMELT_DESC)
echo descfile at $@ caret $^ GCCMELT_DESC=$(GCCMELT_DESC)
