[packages/ejabberd.git] / ejabberd-paths.patch

diff -dur -x '*~' ejabberd-13.10.orig/Makefile.in ejabberd-13.10/Makefile.in
--- ejabberd-13.10.orig/Makefile.in	2013-09-27 11:19:22.000000000 +0200
+++ ejabberd-13.10/Makefile.in	2013-11-14 22:08:25.461196174 +0100
@@ -9,7 +9,7 @@
 DESTDIR =
 
 # /etc/ejabberd/
-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
+ETCDIR = $(DESTDIR)@sysconfdir@/jabber
 
 # /sbin/
 SBINDIR = $(DESTDIR)@sbindir@
@@ -123,7 +123,7 @@
 	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
 		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
 		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
+	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/ejabberd-inetrc
 	#
 	# Administration script
 	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
diff -dur -x '*~' ejabberd-13.10.orig/ejabberdctl.template ejabberd-13.10/ejabberdctl.template
--- ejabberd-13.10.orig/ejabberdctl.template	2013-09-27 11:19:22.000000000 +0200
+++ ejabberd-13.10/ejabberdctl.template	2013-11-14 22:08:57.068093561 +0100
@@ -56,7 +56,7 @@
 
 # Define ejabberd variable if they have not been defined from the command line
 if [ "$ETCDIR" = "" ] ; then
-    ETCDIR={{sysconfdir}}/ejabberd
+    ETCDIR={{sysconfdir}}/jabber
 fi
 if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then
     EJABBERDCTL_CONFIG_PATH=$ETCDIR/ejabberdctl.cfg
@@ -104,7 +104,7 @@
 SASL_LOG_PATH=$LOGS_DIR/erlang.log
 DATETIME=`date "+%Y%m%d-%H%M%S"`
 ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
-ERL_INETRC=$ETCDIR/inetrc
+ERL_INETRC=$ETCDIR/ejabberd-inetrc
 HOME=$SPOOLDIR
 
 # define erl parameters
Commit	Line	Data
fcf4c7a2	1	diff -dur -x '*~' ejabberd-13.10.orig/Makefile.in ejabberd-13.10/Makefile.in
9a6073b0 JK	2	--- ejabberd-13.10.orig/Makefile.in 2013-09-27 11:19:22.000000000 +0200
	3	+++ ejabberd-13.10/Makefile.in 2013-11-14 22:08:25.461196174 +0100
	4	@@ -9,7 +9,7 @@
	5	DESTDIR =
	6
	7	# /etc/ejabberd/
	8	-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
	9	+ETCDIR = $(DESTDIR)@sysconfdir@/jabber
	10
	11	# /sbin/
	12	SBINDIR = $(DESTDIR)@sbindir@
fcf4c7a2 JK	13	@@ -123,7 +123,7 @@
	14	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
	15	&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
	16	\|\| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
	17	- $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
	18	+ $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/ejabberd-inetrc
	19	#
	20	# Administration script
	21	[ -d $(SBINDIR) ] \|\| $(INSTALL) -d -m 755 $(SBINDIR)
	22	diff -dur -x '*~' ejabberd-13.10.orig/ejabberdctl.template ejabberd-13.10/ejabberdctl.template
	23	--- ejabberd-13.10.orig/ejabberdctl.template 2013-09-27 11:19:22.000000000 +0200
9a6073b0 JK	24	+++ ejabberd-13.10/ejabberdctl.template 2013-11-14 22:08:57.068093561 +0100
	25	@@ -56,7 +56,7 @@
	26
	27	# Define ejabberd variable if they have not been defined from the command line
	28	if [ "$ETCDIR" = "" ] ; then
	29	- ETCDIR={{sysconfdir}}/ejabberd
	30	+ ETCDIR={{sysconfdir}}/jabber
	31	fi
	32	if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then
	33	EJABBERDCTL_CONFIG_PATH=$ETCDIR/ejabberdctl.cfg
fcf4c7a2 JK	34	@@ -104,7 +104,7 @@
	35	SASL_LOG_PATH=$LOGS_DIR/erlang.log
	36	DATETIME=`date "+%Y%m%d-%H%M%S"`
	37	ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
	38	-ERL_INETRC=$ETCDIR/inetrc
	39	+ERL_INETRC=$ETCDIR/ejabberd-inetrc
	40	HOME=$SPOOLDIR
	41
	42	# define erl parameters