From f30843a0844f083dfb8780e13839622d28ec2fb9 Mon Sep 17 00:00:00 2001
From: Tristan Gingold
Date: Tue, 18 Nov 2014 19:13:57 +0100
Subject: gcc/Make-lang.in: handle non-default libexecdir.

---
 dist/gcc/Make-lang.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'dist/gcc/Make-lang.in')

diff --git a/dist/gcc/Make-lang.in b/dist/gcc/Make-lang.in
index fea35ef..8b83c35 100644
--- a/dist/gcc/Make-lang.in
+++ b/dist/gcc/Make-lang.in
@@ -87,7 +87,7 @@ ghdl1$(exeext): force $(GHDL1_OBJS) $(BACKEND) $(LIBDEPS)
 	 -largs --LINK=$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) $(GHDL1_OBJS) \
 	 $(filter-out main.o,$(BACKEND)) $(LIBS) $(BACKENDLIBS)
 
-vhdl/default_pathes.ads:
+vhdl/default_pathes.ads: Makefile
 	echo "--  DO NOT EDIT" > tmp-dpathes.ads
 	echo "--  This file is created by Makefile" >> tmp-dpathes.ads
 	echo "package Default_Pathes is" >> tmp-dpathes.ads
@@ -95,8 +95,10 @@ vhdl/default_pathes.ads:
 	echo "   pragma Style_Checks (\"M999\");"  >> tmp-dpathes.ads
 	echo "   Install_Prefix : constant String :=" >> tmp-dpathes.ads
 	echo "     \"$(exec_prefix)\";" >> tmp-dpathes.ads
-	echo "   Compiler_Gcc   : constant String :=" >> tmp-dpathes.ads
-	echo "     \"libexec/gcc/$(target_noncanonical)/$(version)/ghdl1$(exeext)\";" >> tmp-dpathes.ads
+	suffix=`expr @"$(libexecdir)" : @"$(prefix)/\(.*\)"`; \
+	if test x"$$suffix" = x; then suffix="$(libexecdir)"; fi; \
+	echo "   Compiler_Gcc   : constant String :=" >> tmp-dpathes.ads; \
+	echo "     \"$$suffix/gcc/$(target_noncanonical)/$(version)/ghdl1$(exeext)\";" >> tmp-dpathes.ads
 	echo "   Compiler_Debug : constant String := \"\";" >> tmp-dpathes.ads
 	echo "   Compiler_Mcode : constant String := \"\";" >> tmp-dpathes.ads
 	echo "   Compiler_Llvm  : constant String := \"\";" >> tmp-dpathes.ads
-- 
cgit