[#3833] Remove unused LEGAL_LOG_DIR macros

diff --git a/src/hooks/dhcp/forensic_log/Makefile.am b/src/hooks/dhcp/forensic_log/Makefile.am
index ff11cdd5cfee75e4e212dca39305d9578e520430..86fb09437e4cd9a0b79589c58fcfb5adf96efc0b 100644 (file)
--- a/src/hooks/dhcp/forensic_log/Makefile.am
+++ b/src/hooks/dhcp/forensic_log/Makefile.am
@@ -1,10 +1,7 @@
 SUBDIRS = . libloadtests tests
 
-legal_log_dir = @localstatedir@/lib/@PACKAGE@
-
 AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
-AM_CPPFLAGS += -DLEGAL_LOG_DIR="\"$(legal_log_dir)\""
 
 AM_CXXFLAGS  = $(KEA_CXXFLAGS)
 

diff --git a/src/hooks/dhcp/forensic_log/meson.build b/src/hooks/dhcp/forensic_log/meson.build
index 3aa60c84bcc8c76b4383ea42df9ed3fa2a30b63c..7640234265c5b0a0fbf52b8a2d2f19661b288f60 100644 (file)
--- a/src/hooks/dhcp/forensic_log/meson.build
+++ b/src/hooks/dhcp/forensic_log/meson.build
@@ -9,7 +9,6 @@ dhcp_forensic_log_lib = shared_library(
     'load_unload.cc',
     'rotating_file.cc',
     'version.cc',
-    cpp_args: [f'-DLEGAL_LOG_DIR="@SHAREDSTATEDIR_INSTALLED@"'],
     dependencies: [CRYPTO_DEP, MYSQL_DEP, POSTGRESQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,

diff --git a/src/hooks/dhcp/forensic_log/tests/Makefile.am b/src/hooks/dhcp/forensic_log/tests/Makefile.am
index 0a34990ee1caab37b68c3c29fb34b791d71adce4..a86f1d1de40828106910f1f0b9eb6839dbbee777 100644 (file)
--- a/src/hooks/dhcp/forensic_log/tests/Makefile.am
+++ b/src/hooks/dhcp/forensic_log/tests/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = .
 
-legal_log_dir = @localstatedir@/lib/@PACKAGE@
-
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/forensic_log -I$(top_srcdir)/src/hooks/dhcp/forensic_log
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
@@ -11,7 +9,6 @@ AM_CPPFLAGS += -DINVALID_FORENSIC_PREROTATE_TEST_SH=\"$(abs_top_srcdir)/README\"
 AM_CPPFLAGS += -DFORENSIC_POSTROTATE_TEST_SH=\"$(abs_top_builddir)/src/hooks/dhcp/forensic_log/tests/forensic_postrotate_test.sh\"
 AM_CPPFLAGS += -DINVALID_FORENSIC_POSTROTATE_TEST_SH=\"$(abs_top_srcdir)/README\"
 AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
-AM_CPPFLAGS += -DLEGAL_LOG_DIR="\"$(legal_log_dir)\""
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
 # Some versions of GCC warn about some versions of Boost regarding

diff --git a/src/hooks/dhcp/forensic_log/tests/meson.build b/src/hooks/dhcp/forensic_log/tests/meson.build
index b49bce20f833b23584317371caa07da070ce7f08..5f71ab5200df185a17b221ccd671f62b91840edc 100644 (file)
--- a/src/hooks/dhcp/forensic_log/tests/meson.build
+++ b/src/hooks/dhcp/forensic_log/tests/meson.build
@@ -42,7 +42,6 @@ dhcp_forensic_log_tests = executable(
         f'-DINVALID_FORENSIC_PREROTATE_TEST_SH="@TOP_SOURCE_DIR@/README"',
         f'-DFORENSIC_POSTROTATE_TEST_SH="@current_build_dir@/forensic_postrotate_test.sh"',
         f'-DINVALID_FORENSIC_POSTROTATE_TEST_SH="@TOP_SOURCE_DIR@/README"',
-        f'-DLEGAL_LOG_DIR="@SHAREDSTATEDIR_INSTALLED@"',
     ],
     dependencies: dependencies,
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index aacb20c49c8975b2c4de94af0505d369aa8805dd..765f705f5c2f2f3a6e86dfb2ba66ba227ff3abf6 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -13,8 +13,7 @@ AM_CPPFLAGS += -DTOP_BUILDDIR="\"$(top_builddir)\""
 # Set location of the kea-lfc binary.
 AM_CPPFLAGS += -DKEA_LFC_EXECUTABLE="\"$(kea_lfc_location)\""
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
-legal_log_dir = @localstatedir@/log/@PACKAGE@
-AM_CPPFLAGS += -DLEGAL_LOG_DIR="\"$(legal_log_dir)\""
+AM_CPPFLAGS += -DLEGAL_LOG_DIR="\"@localstatedir@/log/@PACKAGE@\""
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)