X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=config%2FMakefile.in;h=16af15167a143148f08ef5b57ac74425bf2517d7;hp=482bca25582524d3b8923c09d38e2fa8405ebb18;hb=f78e7c6e6e616cc4ff2bee8a726365fafef2d8ce;hpb=faa066cb24d3308ab5d2c40ed145ecb3940461bf

diff --git a/config/Makefile.in b/config/Makefile.in
index 482bca2..16af151 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,11 +1,6 @@
 #
 # Makefile for config subdirectory
 #
-# $Id$
-#
-
-# nmh version
-VERSION = @VERSION@
 
 SHELL = /bin/sh
 
@@ -19,15 +14,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)
@@ -42,23 +39,14 @@ COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
 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)
+OBJS = config.o
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
 all: $(OBJS)
 
-version.c:
-	${srcdir}/version.sh $(VERSION) > version.c
-
 config.o: config.c
-	$(COMPILE2) $<
+	$(COMPILE2) $(srcdir)/config.c
 
 install:
 
@@ -72,7 +60,6 @@ mostlyclean:
 	rm -f *.o *~
 
 clean: mostlyclean
-	rm -f version.c
 
 distclean: clean
 	rm -f Makefile
@@ -87,11 +74,4 @@ subdir = config
 
 Makefile: Makefile.in ../config.status
 	cd .. && ./config.status $(subdir)/$@
- 
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done