support of GHDL_PREFIX env variable, use ghdl_release instead of ghdl_version

1 files changed, 19 insertions, 3 deletions

diff --git a/translate/ghdldrv/ghdlcomp.adb b/translate/ghdldrv/ghdlcomp.adb
index eb89908..a3895f9 100644
--- a/translate/ghdldrv/ghdlcomp.adb
+++ b/translate/ghdldrv/ghdlcomp.adb
@@ -33,6 +33,7 @@ with Libraries;
 with Std_Package;
 with Files_Map;
 with Version;
+with Default_Pathes;
 
 package body Ghdlcomp is
 
@@ -465,9 +466,24 @@ package body Ghdlcomp is
          raise Errorout.Option_Error;
       end if;
 
+      Put ("command line prefix (--PREFIX): ");
+      if Prefix_Path = null then
+         Put_Line ("(not set)");
+      else
+         Put_Line (Prefix_Path.all);
+      end if;
       Setup_Libraries (False);
-      Put ("library directory: ");
-      Put_Line (Prefix_Path.all);
+
+      Put ("environment prefix (GHDL_PREFIX): ");
+      if Prefix_Env = null then
+         Put_Line ("(not set)");
+      else
+         Put_Line (Prefix_Env.all);
+      end if;
+
+      Put_Line ("default prefix: " & Default_Pathes.Prefix);
+      Put_Line ("actual prefix: " & Prefix_Path.all);
+      Put_Line ("command_name: " & Ada.Command_Line.Command_Name);
       Put_Line ("default library pathes:");
       for I in 2 .. Get_Nbr_Pathes loop
          Put (' ');
@@ -596,7 +612,7 @@ package body Ghdlcomp is
 
       Put_Line ("# Makefile automatically generated by ghdl");
       Put ("# Version: ");
-      Put (Version.Ghdl_Version);
+      Put (Version.Ghdl_Release);
       Put (" - ");
       if Version_String /= null then
          Put (Version_String.all);