$NetBSD: patch-aa,v 1.18 2023/08/11 13:50:30 manu Exp $ Fix locations; don't mess with ownership. --- Makefile.in.orig 2022-05-06 15:12:22.000000000 +0200 +++ Makefile.in 2023-08-11 09:08:52.337637204 +0200 @@ -9,9 +9,10 @@ DESTDIR = # /etc/ejabberd/ -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd +ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd +SYSCONFDIR_ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd # /bin/ BINDIR = $(DESTDIR)@bindir@ @@ -21,9 +22,9 @@ # /lib/ LIBDIR = $(DESTDIR)@libdir@ # /lib/ejabberd/ -EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd +EJABBERDDIR = $(LIBDIR)/ejabberd # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ datarootdir = @datarootdir@ @@ -65,33 +66,20 @@ # /usr/lib/ejabberd/priv/lua LUADIR = $(PRIVDIR)/lua # /var/lib/ejabberd/ -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd +SPOOLDIR = $(DESTDIR)@EJABBERD_DB@ # /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 ifeq "$(MIX)" "mix" REBAR_VER:=6 REBAR_VER_318:=0 @@ -293,21 +281,21 @@ -e "s*{{bindir}}/iex*$(iexpath)*g" \ -e "s*{{bindir}}*@bindir@*g" \ -e "s*{{libdir}}*${relivelibdir}*g" \ -e "s*{{erl}}*@ERL@*g" \ - -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \ - > ejabberdctl.relive + -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \ + $(SED) -e "s*\${DESTDIR}**g" > ejabberdctl.relive ejabberdctl.example: vars.config $(SED) -e "s*{{installuser}}*@INSTALLUSER@*g" \ - -e "s*{{config_dir}}*${ETCDIR}*g" \ + -e "s*{{config_dir}}*${SYSCONFDIR_ETCDIR}*g" \ -e "s*{{logs_dir}}*${LOGDIR}*g" \ -e "s*{{spool_dir}}*${SPOOLDIR}*g" \ -e "s*{{bindir}}*@bindir@*g" \ -e "s*{{libdir}}*@libdir@*g" \ -e "s*{{erl}}*@ERL@*g" \ - -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \ - > ejabberdctl.example + -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \ + $(SED) -e "s*\${DESTDIR}**g" > ejabberdctl.example install: copy-files ejabberdctl.example # # Configuration files