Commits

camlspotter  committed 12a0867 Merge

merge with p4_expand_directory

  • Participants
  • Parent commits 5ec3846, d86b71c
  • Branches custom

Comments (0)

Files changed (2)

File camlp4/Camlp4Bin.ml

   };
 
 value initial_spec_list =
-  [("-I", Arg.String (fun x -> input_file (IncludeDir x)),
+  [("-I", Arg.String (fun x -> input_file (IncludeDir (Camlp4_import.Misc.expand_directory Camlp4_config.ocaml_standard_library x))),
     "<directory>  Add directory in search patch for object files.");
   ("-where", Arg.Unit print_stdlib,
     "Print camlp4 library directory and exit.");

File camlp4/boot/camlp4boot.ml

          !rcall_callback ())
       
     let initial_spec_list =
-      [ ("-I", (Arg.String (fun x -> input_file (IncludeDir x))),
+      [ ("-I", (Arg.String (fun x -> input_file (IncludeDir (Camlp4_import.Misc.expand_directory Camlp4_config.ocaml_standard_library x)))),
          "<directory>  Add directory in search patch for object files.");
         ("-where", (Arg.Unit print_stdlib),
          "Print camlp4 library directory and exit.");