blob: d537adff84d82bcf88b25b8ff7555c1bf0d382c6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
$NetBSD: patch-aa,v 1.13 2015/11/05 12:23:50 fhajny Exp $
Fix locations; don't mess with ownership.
--- Makefile.in.orig 2015-10-28 14:53:12.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,10 +18,10 @@ BINDIR = $(DESTDIR)@bindir@
SBINDIR = $(DESTDIR)@sbindir@
# /lib/
-LIBDIR = $(DESTDIR)@libdir@
+LIBDIR = $(DESTDIR)@prefix@/lib/erlang/lib
# /lib/ejabberd/
-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
+EJABBERDDIR = $(LIBDIR)/ejabberd
# /share/doc/ejabberd
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -50,16 +50,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
@@ -70,10 +70,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
|
