From 3e9d15a4dabeda7c81f24adf60490b29a6b8a4a0 Mon Sep 17 00:00:00 2001 From: Robert Manner Date: Thu, 2 Jan 2020 14:47:53 +0100 Subject: [PATCH] plugins/python/Makefile.in: fix the install path of examples Examples are installed by default to "docdir", which refers to PACKAGE_TARNAME variable which was empty for the python plugin Makefile.in So the examples were installed to '.../share/doc/examples' instead of '.../share/doc/sudo/examples'. This also made them be skipped from the package. Also the install target now depends on install-doc so the examples gets installed also (similarly as other examples). --- plugins/python/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/python/Makefile.in b/plugins/python/Makefile.in index 0854e1b49..3b8c8031d 100644 --- a/plugins/python/Makefile.in +++ b/plugins/python/Makefile.in @@ -20,6 +20,8 @@ #### Start of system configuration section. #### +PACKAGE_TARNAME = @PACKAGE_TARNAME@ + srcdir = @srcdir@ devdir = @devdir@ top_builddir = @top_builddir@ @@ -106,7 +108,7 @@ install_gid = 0 SHELL = @SHELL@ -EXAMPLES = example_conversation.py example_debugging.py example_group_plugin.py example_io_plugin.py example_policy_plugin.py +EXAMPLES = $(srcdir)/example_conversation.py $(srcdir)/example_debugging.py $(srcdir)/example_group_plugin.py $(srcdir)/example_io_plugin.py $(srcdir)/example_policy_plugin.py OBJS = python_plugin_common.lo python_plugin_policy.lo python_plugin_io.lo python_plugin_group.lo pyhelpers.lo \ python_importblocker.lo python_convmessage.lo sudo_python_module.lo sudo_python_debug.lo \ @@ -147,7 +149,7 @@ python_plugin.la: $(OBJS) $(LT_LIBS) @LT_LDDEP@ pre-install: -install: install-plugin +install: install-plugin install-doc install-dirs: $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) $(DESTDIR)$(exampledir)