From 7670f238054daa0c64bb5946e228dda77fe53ab7 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 17 Nov 2024 14:38:14 +0100 Subject: [PATCH] src/klish-plugin-infix: adapt to new klish plugin path Signed-off-by: Joachim Wiberg --- src/klish-plugin-infix/configure.ac | 3 --- src/klish-plugin-infix/src/Makefile.am | 11 +++++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/klish-plugin-infix/configure.ac b/src/klish-plugin-infix/configure.ac index fa8f2bc7..9db70db0 100644 --- a/src/klish-plugin-infix/configure.ac +++ b/src/klish-plugin-infix/configure.ac @@ -50,9 +50,6 @@ AS_IF([test "x$with_shell" != "xno"], [ test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -KLISHLIBDIR=`eval echo $libdir/klish` -AC_SUBST(KLISHLIBDIR) - KLISHCONFDIR=`eval echo $sysconfdir/klish` AC_SUBST(KLISHCONFDIR) diff --git a/src/klish-plugin-infix/src/Makefile.am b/src/klish-plugin-infix/src/Makefile.am index 18ad1bb1..3f0b64e8 100644 --- a/src/klish-plugin-infix/src/Makefile.am +++ b/src/klish-plugin-infix/src/Makefile.am @@ -1,10 +1,9 @@ AM_CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE -D_GNU_SOURCE CFLAGS = -Wall -Wextra -Werror -Wno-unused-parameter -pluginsdir = $(KLISHLIBDIR)/plugins -plugins_LTLIBRARIES = kplugin-infix.la +lib_LTLIBRARIES = libklish-plugin-infix.la -kplugin_infix_la_CFLAGS = $(sysrepo_CFLAGS) $(klish_CFLAGS) $(libyang_CFLAGS) $(CFLAGS) -kplugin_infix_la_LIBADD = $(sysrepo_LIBS) $(klish_LIBS) $(libyang_LIBS) -kplugin_infix_la_LDFLAGS = -module -avoid-version -shared -kplugin_infix_la_SOURCES = infix.c +libklish_plugin_infix_la_CFLAGS = $(sysrepo_CFLAGS) $(klish_CFLAGS) $(libyang_CFLAGS) $(CFLAGS) +libklish_plugin_infix_la_LIBADD = $(sysrepo_LIBS) $(klish_LIBS) $(libyang_LIBS) +libklish_plugin_infix_la_LDFLAGS = -module -avoid-version -shared +libklish_plugin_infix_la_SOURCES = infix.c