$NetBSD: patch-aa,v 1.12 2015/04/29 10:03:58 fhajny Exp $ Fix locations; don't mess with ownership. --- Makefile.in.orig 2015-04-23 08:14:08.000000000 +0000 +++ Makefile.in @@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@ DESTDIR = # /etc/ejabberd/ -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd +ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd # /bin/ BINDIR = $(DESTDIR)@bindir@ @@ -18,7 +18,7 @@ BINDIR = $(DESTDIR)@bindir@ SBINDIR = $(DESTDIR)@sbindir@ # /lib/ejabberd/ -EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd +EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@ # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -47,16 +47,16 @@ MSGSDIR = $(PRIVDIR)/msgs SQLDIR = $(PRIVDIR)/sql # /var/lib/ejabberd/ -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd +SPOOLDIR = $(DESTDIR)@EJABBERD_DB@ # /var/lock/ejabberdctl -CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl +CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@ # /var/lib/ejabberd/.erlang.cookie COOKIEFILE = $(SPOOLDIR)/.erlang.cookie # /var/log/ejabberd/ -LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd +LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@ INSTALLUSER=@INSTALLUSER@ # if no user was enabled, don't set privileges or ownership @@ -67,10 +67,10 @@ ifeq ($(INSTALLUSER),) CHOWN_OUTPUT=/dev/null INIT_USER=root else - O_USER=-o $(INSTALLUSER) - G_USER=-g $(INSTALLUSER) - CHOWN_COMMAND=chown - CHOWN_OUTPUT=&1 + O_USER= + G_USER= + CHOWN_COMMAND=echo + CHOWN_OUTPUT=/dev/null INIT_USER=$(INSTALLUSER) endif