diff --git a/doc/conf.py.in b/doc/conf.py.in index 91e16452f3..9720d12ade 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -38,7 +38,6 @@ extensions += ["broxygen"] bro_binary = os.path.abspath("@CMAKE_SOURCE_DIR@/build/src/bro") broxygen_cache="@BROXYGEN_CACHE_DIR@" os.environ["BROPATH"] = "@BROPATH@" -os.environ["BROMAGIC"] = "@BROMAGIC@" # ----- End of Broxygen configuration. ----- # -- General configuration ----------------------------------------------------- diff --git a/doc/quickstart/index.rst b/doc/quickstart/index.rst index 19add23bd4..b506eb95c2 100644 --- a/doc/quickstart/index.rst +++ b/doc/quickstart/index.rst @@ -426,7 +426,7 @@ Running Bro Without Installing For developers that wish to run Bro directly from the ``build/`` directory (i.e., without performing ``make install``), they will have -to first adjust ``BROPATH`` and ``BROMAGIC`` to look for scripts and +to first adjust ``BROPATH`` to look for scripts and additional files inside the build directory. Sourcing either ``build/bro-path-dev.sh`` or ``build/bro-path-dev.csh`` as appropriate for the current shell accomplishes this and also augments your diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg index 0130cb6e1d..e750cd0199 100644 --- a/testing/btest/btest.cfg +++ b/testing/btest/btest.cfg @@ -8,7 +8,6 @@ PartFinalizer = btest-diff-rst [environment] BROPATH=`bash -c %(testbase)s/../../build/bro-path-dev` -BROMAGIC=%(testbase)s/../../magic/database BRO_SEED_FILE=%(testbase)s/random.seed TZ=UTC LC_ALL=C diff --git a/testing/external/subdir-btest.cfg b/testing/external/subdir-btest.cfg index f68849314e..f79c432445 100644 --- a/testing/external/subdir-btest.cfg +++ b/testing/external/subdir-btest.cfg @@ -7,7 +7,6 @@ IgnoreFiles = *.tmp *.swp #* *.trace .gitignore *.skeleton [environment] BROPATH=`bash -c %(testbase)s/../../../build/bro-path-dev`:%(testbase)s/../scripts -BROMAGIC=%(testbase)s/../../../magic/database BRO_SEED_FILE=%(testbase)s/../random.seed TZ=UTC LC_ALL=C