diff -ruN mtools-4.0.48-orig/Makefile.in mtools-4.0.48/Makefile.in --- mtools-4.0.48-orig/Makefile.in 2025-02-05 06:30:43.000000000 -0600 +++ mtools-4.0.48/Makefile.in 2025-02-23 05:58:08.000000000 -0600 @@ -145,7 +145,7 @@ $(CC) $(CFLAGS) -c $< mtools$(EXEEXT): $(OBJS_MTOOLS) - $(LINK) $(OBJS_MTOOLS) -o $@ $(ALLLIBS) + $(LINK) $(OBJS_MTOOLS) -o $@ $(ALLLIBS) -liconv mkmanifest$(EXEEXT): $(OBJS_MKMANIFEST) $(LINK) $(OBJS_MKMANIFEST) -o $@ $(ALLLIBS) diff -ruN mtools-4.0.48-orig/config.c mtools-4.0.48/config.c --- mtools-4.0.48-orig/config.c 2025-02-08 13:43:26.000000000 -0600 +++ mtools-4.0.48/config.c 2025-02-23 05:58:58.000000000 -0600 @@ -849,13 +849,7 @@ memcpy(devices, const_devices, nr_const_devices*sizeof(struct device)); - (void) ((parse(CONF_FILE,1) | - parse(LOCAL_CONF_FILE,1) | - parse(SYS_CONF_FILE,1)) || - (parse(OLD_CONF_FILE,1) | - parse(OLD_LOCAL_CONF_FILE,1))); - /* the old-name configuration files only get executed if none of the - * new-name config files were used */ + parse(SYS_CONF_FILE,1); homedir = get_homedir(); if ( homedir ){ diff -ruN mtools-4.0.48-orig/mtools.info mtools-4.0.48/mtools.info --- mtools-4.0.48-orig/mtools.info 2025-02-22 09:26:50.000000000 -0600 +++ mtools-4.0.48/mtools.info 2025-02-23 05:59:56.000000000 -0600 @@ -580,9 +580,6 @@ '/etc/mtools.conf' is the system-wide configuration file, and '~/.mtoolsrc' is the user's private configuration file. - On some systems, the system-wide configuration file is called -'/etc/default/mtools.conf' instead. - File: mtools.info, Node: general syntax, Next: default values, Prev: configuration file location, Up: Configuration diff -ruN mtools-4.0.48-orig/mtools.texi mtools-4.0.48/mtools.texi --- mtools-4.0.48-orig/mtools.texi 2025-02-22 08:59:01.000000000 -0600 +++ mtools-4.0.48/mtools.texi 2025-02-23 06:00:11.000000000 -0600 @@ -653,9 +653,6 @@ @file{@value{SYSCONFDIR}mtools.conf} is the system-wide configuration file, and @file{~/.mtoolsrc} is the user's private configuration file. -On some systems, the system-wide configuration file is called -@file{/etc/default/mtools.conf} instead. - @node general syntax, default values, configuration file location, Configuration @subsection General configuration file syntax diff -ruN mtools-4.0.48-orig/mtools.tmpl.5 mtools-4.0.48/mtools.tmpl.5 --- mtools-4.0.48-orig/mtools.tmpl.5 2025-02-22 09:26:49.000000000 -0600 +++ mtools-4.0.48/mtools.tmpl.5 2025-02-23 05:59:32.000000000 -0600 @@ -33,9 +33,6 @@ \&\fR\&\f(CW\(ifSYSCONFDIRmtools.conf\(is\fR is the system-wide configuration file, and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR is the user's private configuration file. .PP -On some systems, the system-wide configuration file is called -\&\fR\&\f(CW\(if/etc/default/mtools.conf\(is\fR instead. -.PP .SS \ \ General\ configuration\ file\ syntax .PP The configuration files is made up of sections. Each section starts diff -ruN mtools-4.0.48-orig/mtoolsPaths.h mtools-4.0.48/mtoolsPaths.h --- mtools-4.0.48-orig/mtoolsPaths.h 2025-02-03 17:21:14.000000000 -0600 +++ mtools-4.0.48/mtoolsPaths.h 2025-02-23 06:00:47.000000000 -0600 @@ -22,22 +22,8 @@ */ -#define CONF_FILE "/etc/mtools.conf" - - -#define OLD_CONF_FILE "/etc/mtools" - - - -#define LOCAL_CONF_FILE "/etc/default/mtools.conf" -/* Use this if you like to keep the configuration file in a non-standard - * place such as /etc/default, /opt/etc, /usr/etc, /usr/local/etc ... - */ - #define SYS_CONF_FILE SYSCONFDIR "/mtools.conf" -#define OLD_LOCAL_CONF_FILE "/etc/default/mtools" - #define CFG_FILE1 "/.mtoolsrc"