X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2FMakefile.in;h=1f1d5aa1fb5bd47c73f17d5a9659b59a8d406e3e;hp=6776c86e94267cf8821228845ef3c94d45e57b4c;hb=104b36e0a37bafe6620062334fa78d484dce321c;hpb=de84e33cbf49bf0e70ad010d58ab9893c5438cff

diff --git a/config/Makefile.in b/config/Makefile.in
index 6776c86..1f1d5aa 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,14 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-default_editor = @editorpath@
-default_pager  = @pagerpath@
+sendmailpath   = @sendmailpath@
 
 CC         = @CC@
 CFLAGS     = @CFLAGS@
 DEFS       = @DEFS@
-INCLUDES   = -I.. -I$(top_srcdir)
+INCLUDES   = -I.. -I$(top_srcdir) @CPPFLAGS@
 CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' \
-             -DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"'
+             -DSENDMAILPATH='"$(sendmailpath)"'
 
 COMPILE  = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
@@ -58,7 +55,7 @@ version.c:
 	${srcdir}/version.sh $(VERSION) > version.c
 
 config.o: config.c
-	$(COMPILE2) $<
+	$(COMPILE2) $(srcdir)/config.c
 
 install:
 
@@ -86,7 +83,7 @@ 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)