From 21b41eea4724c57d2b6e5998cf38255046e43ad3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 11 Feb 2008 01:02:00 +0100 Subject: Combine IP{,6}T_LIB_DIR into XTABLES_LIBDIR --- ip6tables-save.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ip6tables-save.c') diff --git a/ip6tables-save.c b/ip6tables-save.c index e7eade17..e4408872 100644 --- a/ip6tables-save.c +++ b/ip6tables-save.c @@ -332,9 +332,14 @@ int main(int argc, char *argv[]) program_name = "ip6tables-save"; program_version = IPTABLES_VERSION; - lib_dir = getenv("IP6TABLES_LIB_DIR"); - if (!lib_dir) - lib_dir = IP6T_LIB_DIR; + lib_dir = getenv("XTABLES_LIBDIR"); + if (lib_dir == NULL) { + lib_dir = getenv("IP6TABLES_LIB_DIR"); + if (lib_dir != NULL) + fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated\n"); + } + if (lib_dir == NULL) + lib_dir = XTABLES_LIBDIR; #ifdef NO_SHARED_LIBS init_extensions(); -- cgit v1.2.3