View | Details | Raw Unified | Return to bug 212328 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.in (-12 / +11 lines)
Lines 21-27 Link Here
21
LIBDIR =  $(DESTDIR)@libdir@
21
LIBDIR =  $(DESTDIR)@libdir@
22
22
23
# /lib/ejabberd/
23
# /lib/ejabberd/
24
EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
24
EJABBERDDIR = $(DESTDIR)@libdir@/erlang/lib/ejabberd-$(PORTVERSION)
25
25
26
# /share/doc/ejabberd
26
# /share/doc/ejabberd
27
PACKAGE_TARNAME = @PACKAGE_TARNAME@
27
PACKAGE_TARNAME = @PACKAGE_TARNAME@
Lines 50-59 Link Here
50
SQLDIR = $(PRIVDIR)/sql
50
SQLDIR = $(PRIVDIR)/sql
51
51
52
# /var/lib/ejabberd/
52
# /var/lib/ejabberd/
53
SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
53
SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
54
54
55
# /var/lock/ejabberdctl
55
# /var/run/ejabberdctl
56
CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
56
CTLLOCKDIR = $(DESTDIR)@localstatedir@/run/ejabberdctl
57
57
58
# /var/lib/ejabberd/.erlang.cookie
58
# /var/lib/ejabberd/.erlang.cookie
59
COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
59
COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
Lines 117-123 Link Here
117
VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
117
VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
118
118
119
ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
119
ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
120
DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
120
DEPS_TO_DEST=$(LIBDIR)/ejabberd-$(PORTVERSION)/lib $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
121
MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
121
MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
122
TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))
122
TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))
123
TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
123
TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
Lines 174-182 Link Here
174
	#
174
	#
175
	# Configuration files
175
	# Configuration files
176
	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
176
	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
177
	[ -f $(ETCDIR)/ejabberd.yml ] \
177
	$(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)
178
		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
179
		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
180
	$(SED) -e "s*{{rootdir}}*@prefix@*" \
178
	$(SED) -e "s*{{rootdir}}*@prefix@*" \
181
		-e "s*{{installuser}}*@INSTALLUSER@*" \
179
		-e "s*{{installuser}}*@INSTALLUSER@*" \
182
		-e "s*{{bindir}}*@bindir@*" \
180
		-e "s*{{bindir}}*@bindir@*" \
Lines 185-196 Link Here
185
		-e "s*{{localstatedir}}*@localstatedir@*" \
183
		-e "s*{{localstatedir}}*@localstatedir@*" \
186
		-e "s*{{docdir}}*@docdir@*" \
184
		-e "s*{{docdir}}*@docdir@*" \
187
		-e "s*{{erl}}*@ERL@*" \
185
		-e "s*{{erl}}*@ERL@*" \
186
		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*"
188
		-e "s*{{epmd}}*@EPMD@*" ejabberdctl.template \
187
		-e "s*{{epmd}}*@EPMD@*" ejabberdctl.template \
189
		> ejabberdctl.example
188
		> ejabberdctl.example
190
	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
189
	$(INSTALL) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
191
		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
190
	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example
192
		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
193
	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
194
	#
191
	#
195
	# Administration script
192
	# Administration script
196
	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
193
	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
Lines 224-234 Link Here
224
	chmod -R 750 $(LOGDIR)
221
	chmod -R 750 $(LOGDIR)
225
	#
222
	#
226
	# Documentation
223
	# Documentation
224
ifndef NOPORTDOCS
227
	$(INSTALL) -d $(DOCDIR)
225
	$(INSTALL) -d $(DOCDIR)
228
	[ -f doc/guide.html ] \
226
	[ -f doc/guide.html ] \
229
		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
227
		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
230
		|| echo "Documentation not included in sources"
228
		|| echo "Documentation not included in sources"
231
	$(INSTALL) -m 644 COPYING $(DOCDIR)
229
	$(INSTALL) -m 644 COPYING $(DOCDIR)
230
endif
232
231
233
uninstall: uninstall-binary
232
uninstall: uninstall-binary
234
233

Return to bug 212328