Fixed paths (libdir->bindir); removed the now unused libdir reference.

[mmh] / config / Makefile.in

diff --git a/config/Makefile.in b/config/Makefile.in
index 6776c86..491ff85 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for config subdirectory
 #
-# $Id$
-#
 
 # nmh version
 VERSION = @VERSION@
@@ -19,15 +17,16 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-default_editor = @editorpath@
-default_pager  = @pagerpath@
+sendmailpath   = @sendmailpath@
+mailspool      = @mailspool@
 
 CC         = @CC@
 CFLAGS     = @CFLAGS@
 DEFS       = @DEFS@
-INCLUDES   = -I.. -I$(top_srcdir)
-CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' \
-             -DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"'
+INCLUDES   = -I.. -I$(top_srcdir) @CPPFLAGS@
+CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' \
+               -DSENDMAILPATH='"$(sendmailpath)"' \
+               -DMAILSPOOL='"$(mailspool)"'
 
 COMPILE  = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
@@ -58,7 +57,7 @@ version.c:
        ${srcdir}/version.sh $(VERSION) > version.c
 
 config.o: config.c
-       $(COMPILE2) $<
+       $(COMPILE2) $(srcdir)/config.c
 
 install:
 
@@ -86,8 +85,8 @@ superclean: realclean
 subdir = config
 
 Makefile: Makefile.in ../config.status
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
- 
+       cd .. && ./config.status $(subdir)/$@
+
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"