We don't need macros for only putting two strings next to each other.

diff --git a/config/config.c b/config/config.c
index d72cd91..24827e9 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -12,10 +12,6 @@
 # include <pwd.h>
 #endif
 
-#define nmhbindir(file) NMHBINDIR#file
-#define nmhetcdir(file) NMHETCDIR#file
-#define nmhlibdir(file) NMHLIBDIR#file
-
 
 /*
 ** Find the location of a format or configuration
@@ -79,7 +75,7 @@ try_it:
        }
 
        /* Check nmh `etc' directory */
-       snprintf (epath, sizeof(epath), nmhetcdir(/%s), file);
+       snprintf (epath, sizeof(epath), NMHETCDIR"/%s", file);
        return (access (epath, R_OK) != NOTOK ? epath : file);
 }
 
@@ -99,7 +95,7 @@ struct swit anoyes[] = {
 */
 
 /* initial profile for new users */
-char *mh_defaults = nmhetcdir (/mh.profile);
+char *mh_defaults = NMHETCDIR"/mh.profile";
 
 /* default name of user profile */
 char *mh_profile = ".mh_profile";
@@ -180,7 +176,7 @@ struct node *m_defs;    /* profile/context structure  */
 /*
 ** This is the program to process MIME composition files
 */
-char *buildmimeproc = nmhbindir (/mhbuild);
+char *buildmimeproc = NMHBINDIR"/mhbuild";
 /*
 ** This is the program to `cat' a file.
 */
@@ -196,18 +192,18 @@ char *faceproc = NULL;
 ** also invoked by the spost program to process an "Fcc", or by
 ** comp/repl/forw/dist to refile a draft message.
 */
-char *fileproc = nmhbindir (/refile);
+char *fileproc = NMHBINDIR"/refile";
 
 /*
 ** This program is called to incorporate messages into a folder.
 */
-char *incproc = nmhbindir (/inc);
+char *incproc = NMHBINDIR"/inc";
 
 /*
 ** When a user runs an nmh program for the first time, this program
 ** is called to create his nmh profile, and mail directory.
 */
-char *installproc = nmhlibdir (/install-mh);
+char *installproc = NMHLIBDIR"/install-mh";
 
 /*
 ** This is the default program invoked by a "list" response
@@ -220,7 +216,7 @@ char *lproc = "more";
 /*
 ** This is the path for the Bell equivalent mail program.
 */
-char *mailproc = nmhbindir (/mhmail);
+char *mailproc = NMHBINDIR"/mhmail";
 
 /*
 ** This is used by mhl as a front-end.  It is also used
@@ -237,29 +233,29 @@ char *moreproc = "more";
 ** It is used by send/spost (with -filter) to filter the message
 ** for "Bcc:" recipients.
 */
-char *mhlproc = nmhlibdir (/mhl);
+char *mhlproc = NMHLIBDIR"/mhl";
 
 /*
 ** This program is called to pack a folder.
 */
-char *packproc = nmhbindir (/packf);
+char *packproc = NMHBINDIR"/packf";
 
 /*
 ** This is the delivery program called by send to actually
 ** deliver mail to users.  This is the interface to the MTS.
 */
-char *postproc = nmhlibdir (/spost);
+char *postproc = NMHLIBDIR"/spost";
 
 /*
 ** This is program is called by slocal to handle
 ** the action `folder' or `+'.
 */
-char *rcvstoreproc = nmhlibdir (/rcvstore);
+char *rcvstoreproc = NMHLIBDIR"/rcvstore";
 
 /*
 ** This program is called to remove a folder.
 */
-char *rmfproc = nmhbindir (/rmf);
+char *rmfproc = NMHBINDIR"/rmf";
 
 /*
 ** This program is called to remove a message by rmm or refile -nolink.
@@ -271,13 +267,13 @@ char *rmmproc = NULL;
 ** This program is usually called by the user's whatnowproc, but it
 ** may also be called directly to send a message previously composed.
  */
-char *sendproc = nmhbindir (/send);
+char *sendproc = NMHBINDIR"/send";
 
 /*
 ** This is the path to the program used by "show"
 ** to display non-text (MIME) messages.
 */
-char *showmimeproc = nmhbindir (/mhshow);
+char *showmimeproc = NMHBINDIR"/mhshow";
 
 /*
 ** This is the default program called by "show" to filter
@@ -285,12 +281,12 @@ char *showmimeproc = nmhbindir (/mhshow);
 ** changed to a pager (such as "more" or "less") if you prefer
 ** that such message not be filtered in any way.
 */
-char *showproc = nmhlibdir (/mhl);
+char *showproc = NMHLIBDIR"/mhl";
 
 /*
 ** This program is called after comp, et. al., have built a draft
 */
-char *whatnowproc = nmhbindir (/whatnow);
+char *whatnowproc = NMHBINDIR"/whatnow";
 
 /*
 ** This is the sendmail interface to use for sending mail.
@@ -320,7 +316,7 @@ char *altmsglink = "@";
 ** This is the global nmh alias file.  It is somewhat obsolete, since
 ** global aliases should be handled by the Mail Transport Agent (MTA).
 */
-char *AliasFile = nmhetcdir (/MailAliases);
+char *AliasFile = NMHETCDIR"/MailAliases";
 
 /*
 ** File protections

diff --git a/sbr/mts.c b/sbr/mts.c
index 3313aef..2f5132f 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -9,9 +9,6 @@
 #include <h/mh.h>   /* for snprintf() */
 #include <h/nmh.h>
 #include <h/utils.h>
-
-#define nmhetcdir(file) NMHETCDIR#file
-
 #include <ctype.h>
 #include <stdio.h>
 #include <h/mts.h>
@@ -45,7 +42,7 @@ static void mts_read_conf_file(FILE *fp);
 /*
 ** nmh mail transport interface customization file
 */
-static char *mtsconf = nmhetcdir(/mts.conf);
+static char *mtsconf = NMHETCDIR"/mts.conf";
 
 char *mmdfldir = MAILSPOOL;
 char *mmdflfil = "";
@@ -68,7 +65,7 @@ static char* masquerade = "";
 /*
 ** Global MailDelivery file
 */
-char *maildelivery = nmhetcdir(/maildelivery);
+char *maildelivery = NMHETCDIR"/maildelivery";
 
 
 /*