Browse Source

Use consistent naming: Always call example files "SOMETHING.example"

master
Dianne Skoll 3 months ago
parent
commit
c5465e147f
Signed by: dianne GPG Key ID: 685A5A5E511D30E2
  1. 2
      .gitignore
  2. 2
      DIST-CONTENTS
  3. 2
      Makefile.in
  4. 4
      configure
  5. 2
      configure.ac
  6. 2
      debian/mailmunge-base.install
  7. 0
      etc/default/mailmunge.example.in

2
.gitignore

@ -44,7 +44,7 @@ debian/tmp/
debian/watch-multiple-mailmunges.debhelper.log
debian/watch-multiple-mailmunges.substvars
debian/watch-multiple-mailmunges/
etc/default/mailmunge.sample
etc/default/mailmunge.example
examples/init-script
htmldocs/
mailmunge

2
DIST-CONTENTS

@ -61,7 +61,7 @@ docs/README
docs/architecture.odg
docs/architecture.svg
docs/style.css
etc/default/mailmunge.sample.in
etc/default/mailmunge.example.in
examples/mailmunge-filter.pl.example
install-sh
logo/mailmunge-logo-for-dark-background.svg

2
Makefile.in

@ -89,7 +89,7 @@ install: all
$(MAKE) -C c install DESTDIR=$(DESTDIR)
$(MAKE) -C perl install DESTDIR=$(DESTDIR)
$(INSTALL) -m 755 -d $(DESTDIR)/etc/default
$(INSTALL) -m 644 etc/default/mailmunge.sample $(DESTDIR)/etc/default/mailmunge.sample
$(INSTALL) -m 644 etc/default/mailmunge.example $(DESTDIR)/etc/default/mailmunge.example
dist: FORCE
./tools/make-dist.sh $(VERSION)

4
configure

@ -4815,7 +4815,7 @@ CONFDIR_EVAL=`echo ${sysconfdir}${CONFSUBDIR}`
ac_config_files="$ac_config_files Makefile c/Makefile script/mailmunge-util pod/mailmunge.pod pod/mailmunge-multiplexor.pod pod/mm-mx-ctrl.pod perl/lib/Mailmunge.pm perl/lib/Mailmunge/Constants.pm systemd-units/mailmunge.service systemd-units/mailmunge-multiplexor.service sysvinit/mailmunge etc/default/mailmunge.sample"
ac_config_files="$ac_config_files Makefile c/Makefile script/mailmunge-util pod/mailmunge.pod pod/mailmunge-multiplexor.pod pod/mm-mx-ctrl.pod perl/lib/Mailmunge.pm perl/lib/Mailmunge/Constants.pm systemd-units/mailmunge.service systemd-units/mailmunge-multiplexor.service sysvinit/mailmunge etc/default/mailmunge.example"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -5520,7 +5520,7 @@ do
"systemd-units/mailmunge.service") CONFIG_FILES="$CONFIG_FILES systemd-units/mailmunge.service" ;;
"systemd-units/mailmunge-multiplexor.service") CONFIG_FILES="$CONFIG_FILES systemd-units/mailmunge-multiplexor.service" ;;
"sysvinit/mailmunge") CONFIG_FILES="$CONFIG_FILES sysvinit/mailmunge" ;;
"etc/default/mailmunge.sample") CONFIG_FILES="$CONFIG_FILES etc/default/mailmunge.sample" ;;
"etc/default/mailmunge.example") CONFIG_FILES="$CONFIG_FILES etc/default/mailmunge.example" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac

2
configure.ac

@ -531,7 +531,7 @@ AC_SUBST(PERLINSTALLCONF)
AC_SUBST(PERLINSTALLSITECONF)
AC_SUBST(PERLINSTALLVENDORCONF)
AC_OUTPUT(Makefile c/Makefile script/mailmunge-util pod/mailmunge.pod pod/mailmunge-multiplexor.pod pod/mm-mx-ctrl.pod perl/lib/Mailmunge.pm perl/lib/Mailmunge/Constants.pm systemd-units/mailmunge.service systemd-units/mailmunge-multiplexor.service sysvinit/mailmunge etc/default/mailmunge.sample)
AC_OUTPUT(Makefile c/Makefile script/mailmunge-util pod/mailmunge.pod pod/mailmunge-multiplexor.pod pod/mm-mx-ctrl.pod perl/lib/Mailmunge.pm perl/lib/Mailmunge/Constants.pm systemd-units/mailmunge.service systemd-units/mailmunge-multiplexor.service sysvinit/mailmunge etc/default/mailmunge.example)
HERE=`pwd`
echo "*** Switching to perl/ directory and running $PERL Makefile.PL..."

2
debian/mailmunge-base.install

@ -1,7 +1,7 @@
debian/tmp/etc/systemd/system/mailmunge-multiplexor.service
debian/tmp/etc/systemd/system/mailmunge.service
debian/tmp/etc/init.d/mailmunge
debian/tmp/etc/default/mailmunge.sample
debian/tmp/etc/default/mailmunge.example
debian/tmp/usr/bin/mailmunge
debian/tmp/usr/bin/mailmunge-multiplexor
debian/tmp/usr/bin/mm-mx-ctrl

0
etc/default/mailmunge.sample.in → etc/default/mailmunge.example.in

Loading…
Cancel
Save