diff options
| author | Tristan Gingold <tgingold@free.fr> | 2014-11-03 20:56:42 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2014-11-03 20:56:42 +0100 |
| commit | e2f3247a550c4289d706734d6fe8a246d8cddc39 (patch) | |
| tree | f95ea02a40918b00a83a57e9a9d1a4aab5263df2 /translate/gcc | |
| parent | a7e6bcde1b4b6956a7d9407cd944c623916c8cf0 (diff) | |
| download | ghdl-e2f3247a550c4289d706734d6fe8a246d8cddc39.tar.gz ghdl-e2f3247a550c4289d706734d6fe8a246d8cddc39.tar.bz2 ghdl-e2f3247a550c4289d706734d6fe8a246d8cddc39.zip | |
Support installation in a different path that configured one.
Diffstat (limited to 'translate/gcc')
| -rw-r--r-- | translate/gcc/Makefile.in | 19 | ||||
| -rwxr-xr-x | translate/gcc/dist.sh | 8 |
2 files changed, 16 insertions, 11 deletions
diff --git a/translate/gcc/Makefile.in b/translate/gcc/Makefile.in index d26ec25a0..13f329660 100644 --- a/translate/gcc/Makefile.in +++ b/translate/gcc/Makefile.in @@ -127,6 +127,7 @@ objdir = . target=@target@ target_alias=@target_alias@ +target_noncanonical:=@target_noncanonical@ xmake_file=@dep_host_xmake_file@ tmake_file=@dep_tmake_file@ #version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c` @@ -139,6 +140,8 @@ VPATH = @srcdir@ # Top build directory, relative to here. top_builddir = .. +version := $(shell cat $(srcdir)/../BASE-VER) + # End of variables for you to override. # Definition of `all' is here so that new rules inserted by sed @@ -169,14 +172,16 @@ drvdir/default_pathes.ads: drvdir Makefile echo "package Default_Pathes is" >> tmp-dpathes.ads echo " -- Accept long lines." >> tmp-dpathes.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 " \"$(libexecsubdir)/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 - echo " Post_Processor : constant String :=\"\";" >> tmp-dpathes.ads - echo " Prefix : constant String :=">> tmp-dpathes.ads - echo " \"$(libsubdir)/vhdl/lib/\";" >> tmp-dpathes.ads + echo " \"libexec/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 + echo " Post_Processor : constant String := \"\";" >> tmp-dpathes.ads + echo " Lib_Prefix : constant String :=">> tmp-dpathes.ads + echo " \"lib/gcc/$(target_noncanonical)/$(version)/vhdl/lib/\";" >> tmp-dpathes.ads echo "end Default_Pathes;" >> tmp-dpathes.ads $(srcdir)/../../move-if-change tmp-dpathes.ads $@ diff --git a/translate/gcc/dist.sh b/translate/gcc/dist.sh index 339bc490d..8632dc574 100755 --- a/translate/gcc/dist.sh +++ b/translate/gcc/dist.sh @@ -225,7 +225,7 @@ check_root () } # Do a make install -do_compile2 () +do_gcc_install () { set -x cd $GCCDISTOBJ @@ -325,7 +325,7 @@ do_dist_phase1 () { do_sources; do_compile; - do_compile2; + do_gcc_install; do_distclean_gcc; do_tar_install; do_tar_dist; @@ -439,8 +439,8 @@ else do_recompile;; update_gcc) do_update_gcc_sources;; - compile2) - do_compile2;; + gcc_install) + do_gcc_install;; tar_install) do_tar_install;; tar_dist) |