$NetBSD: patch-aa,v 1.16 2021/01/16 20:24:33 triaxx Exp $ Fix locations; don't mess with ownership. --- Makefile.in.orig 2020-12-15 14:40:16.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@ @@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@ LIBDIR = $(DESTDIR)@libdir@ # /lib/ejabberd/ -EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd +EJABBERDDIR = $(LIBDIR)/ejabberd # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -65,37 +65,24 @@ SQLDIR = $(PRIVDIR)/sql LUADIR = $(PRIVDIR)/lua # /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 -ifeq ($(INSTALLUSER),) O_USER= G_USER= CHOWN_COMMAND=echo CHOWN_OUTPUT=/dev/null INIT_USER=root -else - O_USER=-o $(INSTALLUSER) - G_USER=-g $(INSTALLUSER) - CHOWN_COMMAND=chown - CHOWN_OUTPUT=&1 - INIT_USER=$(INSTALLUSER) -endif -# if no group was enabled, don't set privileges or ownership INSTALLGROUP=@INSTALLGROUP@ -ifneq ($(INSTALLGROUP),) - G_USER=-g $(INSTALLGROUP) -endif IS_REBAR3:=$(shell expr `$(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}'` '>=' 3)