Merge branch 'libexec' into tip

Conflict in bash/pkglibexec/Makefile.am caused by renaming from
bash/Makefile.am. Resolved.

Signed-off-by: Mark Grant <[email protected]>

Makefile.am

@@ -17,7 +17,9 @@ ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS =
 
 
-SUBDIRS = src/prg/bash src/man/1
+SUBDIRS = src/prg/bash/bin
+SUBDIRS += src/prg/bash/pkglibexec
+SUBDIRS += src/man/1
 
 
 doc_DATA = AUTHORS ChangeLog COPYING NEWS README

README

@@ -6,7 +6,7 @@ Authors:-
 
 Copyright (C) 2011 Christian Brenner
 
-Copyright (C) 2020 Mark Grant
+Copyright (C) 2020, 2023 Mark Grant
 
 --------
 Contents
@@ -58,9 +58,10 @@ e) ... Type './configure'
 
 f) ... As root or sudo, type 'make install clean'
 
-g) ... Determine where the scripts have been installed. This will almost
-certainly be /usr/local/bin but can be discovered by typing
-'which evolution-clamav.sh'
+g) ... Determine where the scripts have been installed. This can be discovered
+by typing:-
+
+	'evolution-clamav-scripts-location'
 
 h) ... Open Evolution
 

configure.ac

@@ -8,8 +8,8 @@
 # Purpose:								#
 # Autoconfigure script file to configure evolution-clamav project.	#
 #									#
-# configure cmd line syntax:						#
-# ./configure								#
+# To get the configure cmd line syntax:-				#
+# ./configure --help							#
 #									#
 # Parameters generic description. For specifics to this configure.ac	#
 # please see inline comments at the point of definition:-		#
@@ -298,7 +298,8 @@ AC_MSG_NOTICE(processing output files)
 
 # Project Makefiles to create.
 AC_CONFIG_FILES([Makefile
-		src/prg/bash/Makefile
+		src/prg/bash/bin/Makefile
+		src/prg/bash/pkglibexec/Makefile
 		src/man/1/Makefile])
 
 AC_OUTPUT

src/man/1/Makefile.am

@@ -12,7 +12,7 @@
 #########################################################################
 
 
-clamscan-notify.sh.1 evolution-clamav.sh.1 evolution-clamavd.sh.1: Makefile
+evolution-clamav-scripts-location.1: Makefile
 	mkdir -p $(@D)
 	rm -f $@ $@.tmp
 	$(edit) $(srcdir)/$(@F).man.in > $@.tmp
@@ -28,18 +28,14 @@ clamscan-notify.sh.1 evolution-clamav.sh.1 evolution-clamavd.sh.1: Makefile
 		echo "Source file suffix used as section but no dot & empty."; \
 		exit 1; \
 	fi; \
-	txt2manwrap $(@F) $$section "evolution-clamav Manual" $@.tmp $@
+	txt2manwrap $(@F) $$section "" $@.tmp $@
 	rm -f $@.tmp
-clamscan-notify.sh.1: $(srcdir)/clamscan-notify.sh.1.man.in
-evolution-clamav.sh.1: $(srcdir)/evolution-clamav.sh.1.man.in
-evolution-clamavd.sh.1: $(srcdir)/evolution-clamavd.sh.1.man.in
+evolution-clamav-scripts-location.1: \
+	$(srcdir)/evolution-clamav-scripts-location.1.man.in
 
-man_MANS = clamscan-notify.sh.1 evolution-clamav.sh.1 evolution-clamavd.sh.1
+man_MANS = evolution-clamav-scripts-location.1
 
-EXTRA_DIST = $(srcdir)/clamscan-notify.sh.1.man.in \
-	$(srcdir)/evolution-clamav.sh.1.man.in \
-	$(srcdir)/evolution-clamavd.sh.1.man.in
+EXTRA_DIST = $(srcdir)/evolution-clamav-scripts-location.1.man.in
 
+CLEANFILES = *.tmp evolution-clamav-scripts-location.1
 
-CLEANFILES = *.tmp clamscan-notify.sh.1 evolution-clamav.sh.1 \
-	evolution-clamavd.sh.1

src/man/1/evolution-clamavd.sh.1.man.in → src/man/1/evolution-clamav-scripts-location.1.man.in

@@ -1,27 +1,28 @@
 NAME
-evolution-clamavd.sh - Scan incoming mail in evolution with the clamav daemon
+evolution-clamav-scripts-location - A script location finding helper script
 SYNOPSIS
-evolution-clamavd.sh [OPTION]
+evolution-clamav-scripts-location [{-h|-V}]
+evolution-clamav-scripts-location [OPTIONS]
 DESCRIPTION
-The script is designed to be a filter in evolution getting input on stdin and
-using the clamav daemon to scan for viruses.
+A helper script which merely outputs the location of the evolution-clamav
+scripts to stdout.
+
 OPTIONS
--h, --help  prints usage information.
+-h, --help  prints usage information
 
 -V, --version  prints version information
 EXIT STATUS
 0 - Success
-
-1 - General failure
-
-64 - Error in command line
-
+.br
+1 - General error
+.br
+64 - Command line usage error
 AUTHOR
 Written by Mark Grant.
 REPORTING BUGS
 Report bugs to <[email protected]>
 COPYRIGHT
-Copyright (C) 2020, 2021 Mark Grant.
+Copyright (C) 2023 Mark Grant.
 .br
 License GPLv3: GNU GPL version 3 only
 .br
@@ -31,5 +32,4 @@ This is free software: you are free to change and redistribute it.
 .br
 There is NO WARRANTY, to the extent permitted by law.
 SEE ALSO
-evolution-clamav.sh clamscan-notify.sh
 

src/prg/bash/bin/Makefile.am

@@ -0,0 +1,32 @@
+#########################################################################
+#									#
+# Author: Copyright (C) 2020, 2021, 2023  Mark Grant			#
+#									#
+# Released under the GPLv3 only.					#
+# SPDX-License-Identifier: GPL-3.0-only					#
+#									#
+# Purpose:								#
+# Automake script file to generate evolution-clamav bindir scripts from	#
+# source.								#
+#									#
+#########################################################################
+
+
+evolution-clamav-scripts-location: Makefile
+	mkdir -p $(@D)
+	rm -f $@ $@.tmp
+	test -f ./$@.in || srcdir=$(srcdir)/; \
+	$(edit) $${srcdir}$(@F).sh.in > $@.tmp
+	mv $@.tmp $@
+	chmod a+x $@
+evolution-clamav-scripts-location: \
+	$(srcdir)/evolution-clamav-scripts-location.sh.in
+
+bin_SCRIPTS = evolution-clamav-scripts-location
+
+
+EXTRA_DIST = $(srcdir)/evolution-clamav-scripts-location.sh.in
+
+
+CLEANFILES = *.tmp evolution-clamav-scripts-location
+