Commit Diff

Commit:
87865d5bf4ce68b0938cc9a471b56337ef6c2176
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
allow changing the www user via --wwwuser or WWWUSER=
Actions:
Patch | Tree
commit - 19d6f99af5f61daea525929d6a9ce53548cc20c3
commit + 87865d5bf4ce68b0938cc9a471b56337ef6c2176
blob - 1b767ccc98c328e1bdd48b69a5ae3dfa6a1135f4
blob + a5121b3fd2cb29be3cebd3e02377f7e39a070e67
--- configure
+++ configure
@@ -56,6 +56,7 @@ while [ $# -gt 0 ]; do
 	--sharedir)	key=SHAREDIR ;;
 	--statedir)	key=STATEDIR ;;
 	--sysconfdir)	key=SYSCONFDIR ;;
+	--wwwuser)	key=WWWUSER ;;
 	esac
 
 	case "$key" in
@@ -70,6 +71,7 @@ while [ $# -gt 0 ]; do
 	SHAREDIR)	SHAREDIR="$val" ;;
 	STATEDIR)	STATECONFDIR="$val" ;;
 	SYSCONFDIR)	SYSCONFDIR="$val" ;;
+	WWWUSER)	WWWUSER="$val" ;;
 	esac
 
 	shift
@@ -80,6 +82,7 @@ CFLAGS=${CFLAGS:--O2 -pipe}
 PREFIX=${PREFIX-/usr/local}
 STATEDIR=${STATEDIR-/var}
 SYSCONFDIR=${SYSCONFDIR-/etc}
+WWWUSER=${WWWUSER:-www}
 
 pkgconfig=${PKG_CONFIG}
 if [ "$pkgconfig" = no ]; then
@@ -115,6 +118,7 @@ LIBEXEC =		\${PREFIX}/libexec
 SBINDIR =		\${PREFIX}/sbin
 STATEDIR =		${STATEDIR}
 SYSCONFDIR =		${SYSCONFDIR}
+WWWUSER =		${WWWUSER}
 EOF
 
 if [ -n "$REALSYSCONFDIR" ]; then
blob - 69af48f548ae091f689cd2f7cafc059386abd489
blob + ad72cb88fb4d2dffcbaae2c49e06b5c57106888a
--- msearchd/Makefile
+++ msearchd/Makefile
@@ -40,8 +40,11 @@ uninstall:
 ${PROG}: ${OBJS}
 	${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS}
 
+DEFS =	-DSYSCONFDIR="\"${REALSYSCONFDIR}\"" \
+	-DMSEARCHD_USER="\"${WWWUSER}\""
+
 .c.o:
-	${CC} -c $< -o $@ -DSYSCONFDIR="\"${REALSYSCONFDIR}\"" ${CFLAGS}
+	${CC} -c $< -o $@ ${DEFS} ${CFLAGS}
 
 # -- maintainer targets --