send paths defined by configure switches to all Makefile.am. Fix #348

OpenSMTPD · Nov 3, 2013 · 70c2943 · 70c2943
1 parent 5486874
commit 70c2943
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/mk/pathnames b/mk/pathnames
@@ -4,3 +4,11 @@ compat_srcdir	= $(top_srcdir)/openbsd-compat
 
 filters_srcdir	= $(smtpd_srcdir)/filters
 backends_srcdir	= $(smtpd_srcdir)/backends
+
+PATHS=			-DSMTPD_CONFDIR=\"$(sysconfdir)\"			\
+			-DPATH_CHROOT=\"$(PRIVSEP_PATH)\"			\
+			-DPATH_SMTPCTL=\"$(sbindir)/smtpctl\"			\
+			-DPATH_MAILLOCAL=\"$(pkglibexecdir)/mail.local\"	\
+			-DPATH_FILTERS=\"$(pkglibexecdir)\"			\
+			-DPATH_TABLES=\"$(pkglibexecdir)\"
+
diff --git a/mk/smtpd/Makefile.am b/mk/smtpd/Makefile.am
@@ -110,12 +110,6 @@ LDADD=			$(LIBCOMPAT)
 CFLAGS+=		-D_GNU_SOURCE
 CPPFLAGS=		-I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
 
-PATHS=			-DSMTPD_CONFDIR=\"$(sysconfdir)\"			\
-			-DPATH_SMTPCTL=\"$(sbindir)/smtpctl\"			\
-			-DPATH_MAILLOCAL=\"$(pkglibexecdir)/mail.local\"	\
-			-DPATH_FILTERS=\"$(pkglibexecdir)\"			\
-			-DPATH_TABLES=\"$(pkglibexecdir)\"
-
 MANPAGES=		aliases.5.out forward.5.out smtpd.8.out			\
 			smtpd.conf.5.out table.5.out
 MANPAGES_IN=		$(smtpd_srcdir)/aliases.5

diff --git a/smtpd/smtpd-defines.h b/smtpd/smtpd-defines.h
@@ -29,11 +29,13 @@
 #define	SMTPD_MAXLINESIZE	2048
 
 #ifndef SMTPD_USER
-#define SMTPD_USER		 "_smtpd"
+#define SMTPD_USER		"_smtpd"
 #endif
+#ifndef PATH_CHROOT
 #define PATH_CHROOT		"/var/empty"
+#endif
 #ifndef SMTPD_QUEUE_USER
-#define SMTPD_QUEUE_USER	 "_smtpq"
+#define SMTPD_QUEUE_USER	"_smtpq"
 #endif
 #ifndef PATH_SPOOL
 #define PATH_SPOOL		"/var/spool/smtpd"