Factor trim format function out

[mmh] / config / Makefile.in

diff --git a/config/Makefile.in b/config/Makefile.in
index c1b16bd..47f9125 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -18,13 +18,16 @@ libdir      = @libdir@
 etcdir      = @sysconfdir@
 
 sendmailpath   = @sendmailpath@
+mailspool      = @mailspool@
 
 CC         = @CC@
 CFLAGS     = @CFLAGS@
 DEFS       = @DEFS@
-INCLUDES   = -I.. -I$(top_srcdir) @CPPFLAGS@
-CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' \
-             -DSENDMAILPATH='"$(sendmailpath)"'
+# 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)
@@ -41,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)
@@ -85,10 +82,3 @@ 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
-