GH-1079: Use full paths starting with zeek/ when including files

src/Options.cc

@@ -2,10 +2,7 @@
 
 #include "zeek-config.h"
 
-#include "Options.h"
-
-#include <algorithm>
-#include <sstream>
+#include "zeek/Options.h"
 
 #include <unistd.h>
 
@@ -13,8 +10,11 @@
 #include <getopt.h>
 #endif
 
-#include "bsd-getopt-long.h"
-#include "logging/writers/ascii/Ascii.h"
+#include <algorithm>
+#include <sstream>
+
+#include "zeek/bsd-getopt-long.h"
+#include "zeek/logging/writers/ascii/Ascii.h"
 
 namespace zeek {
 
@@ -203,7 +203,7 @@ Options parse_cmdline(int argc, char** argv)
 			if ( i < argc )
 				{
 				// If a script is invoked with Zeek as the interpreter, the arguments provided
-				// directly in the interpreter line of the script won't be broken apart in the 
+				// directly in the interpreter line of the script won't be broken apart in the
 				// argv on Linux so we split it up here.
 				if ( endsWith(argv[i], "--") && zeek_args.size() == 1 )
 					{