X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2FMakefile.in;h=8f21039c1d4a601a7e9096ee4651b7ddbff8f7f5;hp=6ca830825d00eeaea45eeb9316402a29fadd97e9;hb=9d65b803e9cd65249ea2317c2f43495b9eed40bc;hpb=582d618b69077087961c367bd1631495906c92a8

diff --git a/config/Makefile.in b/config/Makefile.in
index 6ca8308..8f21039 100644
--- 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 = -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) config.c
+	$(COMPILE2) $(srcdir)/config.c
 
 install:
 
@@ -87,9 +86,9 @@ subdir = config
 
 Makefile: Makefile.in ../config.status
 	cd .. && ./config.status $(subdir)/$@
- 
+
 distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
+mmhdist: $(DIST)
 	@echo "Copying distribution files in $(subdir)"
 	@for file in $(DIST); do \
 	  cp -p $(srcdir)/$$file $(distdir); \