From a68d0a0033a99545601011ffbaaa156c93504c31 Mon Sep 17 00:00:00 2001 From: Lindsay Date: Sat, 6 Jan 2018 22:18:27 -0600 Subject: Configured source to put mailman-config in bin rather than contrib. Changed the name from mailman-config.py to mailman-config. --- bin/Makefile.in | 2 +- bin/mailman-config | 22 ++++++++++++++++++++++ configure | 16 ++++++++++++++-- configure.in | 2 +- contrib/mailman-config.py | 22 ---------------------- 5 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 bin/mailman-config delete mode 100644 contrib/mailman-config.py diff --git a/bin/Makefile.in b/bin/Makefile.in index 22c24b04..c8fae282 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -49,7 +49,7 @@ SCRIPTS= mmsitepass newlist rmlist add_members \ list_admins genaliases change_pw mailmanctl qrunner inject \ unshunt fix_url.py convert.py transcheck b4b5-archfix \ list_owners msgfmt.py show_qfiles discard rb-archfix \ - reset_pw.py export.py + reset_pw.py export.py mailman-config BUILDDIR= ../build/bin diff --git a/bin/mailman-config b/bin/mailman-config new file mode 100644 index 00000000..70492036 --- /dev/null +++ b/bin/mailman-config @@ -0,0 +1,22 @@ +#! @PYTHON@ + +# Show build-time configuration options +# This is free software under the GNU General Public License. +# Send bug reports or suggestions to Lindsay Haisley + +print """Configuration and build information for Mailman\n""" + +print "Mailman version: %s" % "@MM_VERSION@" +print "Build Date: %s" % "@BUILD_DATE@" +print "" +print "prefix: %s" % "@prefix@" +print "var_prefix: %s" % "@VAR_PREFIX@" +print "mailman_user: %s" % "@MAILMAN_USER@" +print "mailman_group: %s" % "@MAILMAN_GROUP@" +print "mail_group: %s" % "@MAIL_GROUP@" +print "cgi_group: %s" % "@CGI_GROUP@" +print "" + + +print "configure_opts: \"%s\"" % "@CONFIGURE_OPTS@" + diff --git a/configure b/configure index 3f67f85e..6749b007 100755 --- a/configure +++ b/configure @@ -675,6 +675,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -756,6 +757,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1008,6 +1010,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1145,7 +1156,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1298,6 +1309,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -4560,13 +4572,13 @@ build/bin/unshunt:bin/unshunt \ build/bin/update:bin/update \ build/bin/version:bin/version \ build/bin/withlist:bin/withlist \ +build/bin/mailman-config:bin/mailman-config \ build/bin/b4b5-archfix:bin/b4b5-archfix \ build/bin/rb-archfix:bin/rb-archfix \ build/contrib/check_perms_grsecurity.py:contrib/check_perms_grsecurity.py \ build/contrib/qmail-to-mailman.py:contrib/qmail-to-mailman.py \ build/contrib/courier-to-mailman.py:contrib/courier-to-mailman.py \ build/contrib/rotatelogs.py:contrib/rotatelogs.py \ -build/contrib/mailman-config.py:contrib/mailman-config.py \ build/cron/bumpdigests:cron/bumpdigests \ build/cron/checkdbs:cron/checkdbs \ build/cron/cull_bad_shunt:cron/cull_bad_shunt \ diff --git a/configure.in b/configure.in index ead04a3a..4946367b 100644 --- a/configure.in +++ b/configure.in @@ -720,13 +720,13 @@ bin/unshunt \ bin/update \ bin/version \ bin/withlist \ +bin/mailman-config \ bin/b4b5-archfix \ bin/rb-archfix \ contrib/check_perms_grsecurity.py \ contrib/qmail-to-mailman.py \ contrib/courier-to-mailman.py \ contrib/rotatelogs.py \ -contrib/mailman-config.py \ cron/bumpdigests \ cron/checkdbs \ cron/cull_bad_shunt \ diff --git a/contrib/mailman-config.py b/contrib/mailman-config.py deleted file mode 100644 index 70492036..00000000 --- a/contrib/mailman-config.py +++ /dev/null @@ -1,22 +0,0 @@ -#! @PYTHON@ - -# Show build-time configuration options -# This is free software under the GNU General Public License. -# Send bug reports or suggestions to Lindsay Haisley - -print """Configuration and build information for Mailman\n""" - -print "Mailman version: %s" % "@MM_VERSION@" -print "Build Date: %s" % "@BUILD_DATE@" -print "" -print "prefix: %s" % "@prefix@" -print "var_prefix: %s" % "@VAR_PREFIX@" -print "mailman_user: %s" % "@MAILMAN_USER@" -print "mailman_group: %s" % "@MAILMAN_GROUP@" -print "mail_group: %s" % "@MAIL_GROUP@" -print "cgi_group: %s" % "@CGI_GROUP@" -print "" - - -print "configure_opts: \"%s\"" % "@CONFIGURE_OPTS@" - -- cgit v1.2.3