Index: tools/generate_static_hash_map.adb
==================================================================
--- tools/generate_static_hash_map.adb
+++ tools/generate_static_hash_map.adb
@@ -19,21 +19,33 @@
 -- map package generator, using a description from S-expression files.      --
 -- It also provides bootstrap for the S-expression description interpreter. --
 ------------------------------------------------------------------------------
 
 with Ada.Command_Line;
+with Ada.Directories;
 with Ada.Text_IO;
 with Natools.Static_Hash_Maps.S_Expressions;
 with Natools.S_Expressions.File_Readers;
 with Natools.S_Expressions.Lockable;
 
 procedure Generate_Static_Hash_Map is
+   Dir_Arg : Natural := 0;
+   First_Arg : Positive := 1;
+   Prev_Dir : constant String := Ada.Directories.Current_Directory;
 begin
-   if Ada.Command_Line.Argument_Count = 0 then
+   if Ada.Command_Line.Argument_Count >= 2
+     and then Ada.Command_Line.Argument (1) = "-C"
+   then
+      Dir_Arg := 2;
+      First_Arg := 3;
+   end if;
+
+   if Ada.Command_Line.Argument_Count < First_Arg then
       Ada.Text_IO.Put_Line
         (Ada.Text_IO.Current_Error,
          "Usage: " & Ada.Command_Line.Command_Name
+         & " [-C target_directory]"
          & " input.sx [other-input.sx ...]");
       Ada.Text_IO.Put_Line
         (Ada.Text_IO.Current_Error,
          "   special argument ""--"" instead of input file bootstraps the");
       Ada.Text_IO.Put_Line
@@ -41,15 +53,20 @@
          "   descriptor interpreter hash map.");
       Ada.Command_Line.Set_Exit_Status (Ada.Command_Line.Failure);
       return;
    end if;
 
-   for I in 1 .. Ada.Command_Line.Argument_Count loop
+   for I in First_Arg .. Ada.Command_Line.Argument_Count loop
       if Ada.Command_Line.Argument (I) = "--" then
          declare
             use Natools.Static_Hash_Maps;
          begin
+            if Dir_Arg > 0 then
+               Ada.Directories.Set_Directory
+                 (Ada.Command_Line.Argument (Dir_Arg));
+            end if;
+
             Generate_Package
               ("Natools.Static_Hash_Maps.S_Expressions.Command_Maps",
                (Map
                  (Element_Type => "Package_Command",
                   Hash_Package_Name =>
@@ -67,19 +84,33 @@
                     (Node ("hash-package", "Hash_Package"),
                      Node ("nodes", "Nodes"),
                      Node ("function", "Function_Name"),
                      Node ("not-found", "Not_Found")))),
                Private_Child => True);
+
+            if Dir_Arg > 0 then
+               Ada.Directories.Set_Directory (Prev_Dir);
+            end if;
          end;
       else
          declare
+            Prev_Dir : constant String := Ada.Directories.Current_Directory;
             Input : Natools.S_Expressions.Lockable.Descriptor'Class
               := Natools.S_Expressions.File_Readers.Reader
                   (Ada.Command_Line.Argument (I));
          begin
+            if Dir_Arg > 0 then
+               Ada.Directories.Set_Directory
+                 (Ada.Command_Line.Argument (Dir_Arg));
+            end if;
+
             Natools.Static_Hash_Maps.S_Expressions.Generate_Packages
               (Input,
                "from " & Ada.Command_Line.Argument (I));
+
+            if Dir_Arg > 0 then
+               Ada.Directories.Set_Directory (Prev_Dir);
+            end if;
          end;
       end if;
    end loop;
 end Generate_Static_Hash_Map;