From cd1299b02c2fbe61f408a8387402494364688337 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Fri, 9 Mar 2012 17:04:46 +0100 Subject: [PATCH] Fixed paths (libdir->bindir); removed the now unused libdir reference. --- config/Makefile.in | 2 +- config/config.c | 5 ++--- uip/mhparam.c | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/Makefile.in b/config/Makefile.in index da7d12a..491ff85 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -25,7 +25,7 @@ CFLAGS = @CFLAGS@ DEFS = @DEFS@ INCLUDES = -I.. -I$(top_srcdir) @CPPFLAGS@ CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' \ - -DNMHLIBDIR='"$(libdir)"' -DSENDMAILPATH='"$(sendmailpath)"' \ + -DSENDMAILPATH='"$(sendmailpath)"' \ -DMAILSPOOL='"$(mailspool)"' COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS) diff --git a/config/config.c b/config/config.c index 3515dd0..158dd7a 100644 --- a/config/config.c +++ b/config/config.c @@ -14,7 +14,6 @@ ** nmh globals */ -char *mhlibdir = NMHLIBDIR; char *mhetcdir = NMHETCDIR; char *invo_name; /* command invocation name */ @@ -160,13 +159,13 @@ char *defaulteditor = "vi"; ** 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 = NMHBINDIR"/spost"; /* ** This is program is called by slocal to handle ** the action `folder' or `+'. */ -char *rcvstoreproc = NMHLIBDIR"/rcvstore"; +char *rcvstoreproc = NMHBINDIR"/rcvstore"; /* ** This program is called to remove a message by rmm or refile -nolink. diff --git a/uip/mhparam.c b/uip/mhparam.c index 2a1d97e..db8e85a 100644 --- a/uip/mhparam.c +++ b/uip/mhparam.c @@ -11,8 +11,6 @@ #include -extern char *mhlibdir; - static struct swit switches[] = { #define COMPSW 0 { "components", 0 }, @@ -58,7 +56,6 @@ static struct proc procs [] = { { "version", &version_num }, { "whatnowproc", &whatnowproc }, { "etcdir", &mhetcdir }, - { "libdir", &mhlibdir }, { "backup-prefix", &backup_prefix }, { "altmsg-link", &altmsglink }, { "draft-folder", &draftfolder }, -- 1.7.10.4