[gcc-6] 207/401: - fix building the docs with --program-prefix

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 0b6df741dfc8deac50bd52b600665a8f3d1ca620
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun Sep 11 10:52:55 2016 +0000

     - fix building the docs with --program-prefix
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8975 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/rules.d/binary-gcc.mk  | 6 ++++--
 debian/rules.d/binary-java.mk | 4 ++--
 debian/rules2                 | 6 ++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index d7745ee..23e66e4 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -325,12 +325,14 @@ $(binary_stamp)-gcc-doc: $(build_html_stamp) $(install_stamp)
 
 ifeq ($(with_gomp),yes)
 	$(MAKE) -C $(buildlibdir)/libgomp stamp-build-info
-	cp -p $(buildlibdir)/libgomp/libgomp$(pkg_ver).info $(d_doc)/$(PF)/share/info/
+	cp -p $(buildlibdir)/libgomp/$(cmd_prefix)libgomp$(pkg_ver).info \
+		$(d_doc)/$(PF)/share/info/libgomp$(pkg_ver).info
 endif
 ifeq ($(with_itm),yes)
 	-$(MAKE) -C $(buildlibdir)/libitm stamp-build-info
 	if [ -f $(buildlibdir)/libitm/libitm$(pkg_ver).info ]; then \
-	  cp -p $(buildlibdir)/libitm/libitm$(pkg_ver).info $(d_doc)/$(PF)/share/info/; \
+	  cp -p $(buildlibdir)/libitm/$(cmd_prefix)libitm$(pkg_ver).info \
+		$(d_doc)/$(PF)/share/info/; \
 	fi
 endif
 
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index 66b6851..7a138a0 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -121,7 +121,7 @@ files_jdk = \
 ifneq ($(GFDL_INVARIANT_FREE),yes)
   files_jdk += \
 	$(PF)/share/info/gcj* \
-	$(PF)/share/man/man1/{gc-analyze,grmic,jv-convert,jcf-dump}$(pkg_ver).1
+	$(PF)/share/man/man1/$(cmd_prefix){gc-analyze,grmic,jv-convert,jcf-dump}$(pkg_ver).1
 endif
 
 dirs_jrehl = \
@@ -144,7 +144,7 @@ files_jrehl = \
 
 ifneq ($(GFDL_INVARIANT_FREE),yes)
   files_jrehl += \
-	$(PF)/share/man/man1/{gij,gcj-dbtool}$(pkg_ver).1
+	$(PF)/share/man/man1/$(cmd_prefix){gij,gcj-dbtool}$(pkg_ver).1
 endif
 
 dirs_jre = \
diff --git a/debian/rules2 b/debian/rules2
index 2b9d792..789e877 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2272,6 +2272,12 @@ else
   endif
 endif
 
+ifneq (,$(cmd_prefix))
+	for i in $(d)/$(PF)/share/info/$(cmd_prefix)*; do \
+	  mv $$i $$(echo $$i | sed 's/$(cmd_prefix)//'); \
+	done
+endif
+
 ifeq ($(with_libcxxdbg),yes)
 	: # FIXME: the libstdc++ gdb.py file is installed with a wrong name
 	for i in $$(find $(d)/$(PF) -name libstdc++_pic.a-gdb.py); do \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git