X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2FMakefile.in;h=47f9125b22776da2fa0a09761137655373764e10;hp=6776c86e94267cf8821228845ef3c94d45e57b4c;hb=18591f8e001ecedbee48a51c1d1f08ebaa1c15c8;hpb=de84e33cbf49bf0e70ad010d58ab9893c5438cff

diff --git a/config/Makefile.in b/config/Makefile.in
index 6776c86..47f9125 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,17 @@ 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)"'
+# add include dir .. for config.h when building in different directory
+INCLUDES   = -I$(top_srcdir) -I.. @CPPFLAGS@
+CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' \
+		-DSENDMAILPATH='"$(sendmailpath)"' \
+		-DMAILSPOOL='"$(mailspool)"'
 
 COMPILE  = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
@@ -44,12 +44,6 @@ SRCS = config.c
 # object files
 OBJS = config.o version.o
 
-# auxiliary files
-AUX = Makefile.in version.sh
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
-
 # ========= DEPENDENCIES FOR BUILDING ==========
 
 all: $(OBJS)
@@ -58,7 +52,7 @@ version.c:
 	${srcdir}/version.sh $(VERSION) > version.c
 
 config.o: config.c
-	$(COMPILE2) $<
+	$(COMPILE2) $(srcdir)/config.c
 
 install:
 
@@ -86,12 +80,5 @@ superclean: realclean
 subdir = config
 
 Makefile: Makefile.in ../config.status
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
- 
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done
+	cd .. && ./config.status $(subdir)/$@