Attachment 174379 Details for Bug 212328 – files/patch-Makefile.in

[patch] files/patch-Makefile.in

patch-Makefile.in (text/plain), 2.95 KB, created by dewayne on 2016-09-05 00:08:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dewayne

Created: 2016-09-05 00:08:52 UTC

Size: 2.95 KB

patch

obsolete

>--- Makefile.in.orig	2016-08-04 17:49:23.000000000 +1000
>+++ Makefile.in	2016-09-05 09:58:50.000000000 +1000
>@@ -21,7 +21,7 @@
> LIBDIR =  $(DESTDIR)@libdir@
> 
> # /lib/ejabberd/
>-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
>+EJABBERDDIR = $(DESTDIR)@libdir@/erlang/lib/ejabberd-$(PORTVERSION)
> 
> # /share/doc/ejabberd
> PACKAGE_TARNAME = @PACKAGE_TARNAME@
>@@ -50,10 +50,10 @@
> SQLDIR = $(PRIVDIR)/sql
> 
> # /var/lib/ejabberd/
>-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
>+SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
> 
>-# /var/lock/ejabberdctl
>-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
>+# /var/run/ejabberdctl
>+CTLLOCKDIR = $(DESTDIR)@localstatedir@/run/ejabberdctl
> 
> # /var/lib/ejabberd/.erlang.cookie
> COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
>@@ -117,7 +117,7 @@
> VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
> 
> ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
>-DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
>+DEPS_TO_DEST=$(LIBDIR)/ejabberd-$(PORTVERSION)/lib $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
> MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
> 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))))
> TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
>@@ -174,9 +174,7 @@
> 	#
> 	# Configuration files
> 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
>-	[ -f $(ETCDIR)/ejabberd.yml ] \
>-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
>-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
>+	$(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)
> 	$(SED) -e "s*{{rootdir}}*@prefix@*" \
> 		-e "s*{{installuser}}*@INSTALLUSER@*" \
> 		-e "s*{{bindir}}*@bindir@*" \
>@@ -185,12 +183,11 @@
> 		-e "s*{{localstatedir}}*@localstatedir@*" \
> 		-e "s*{{docdir}}*@docdir@*" \
> 		-e "s*{{erl}}*@ERL@*" \
>+		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*"
> 		-e "s*{{epmd}}*@EPMD@*" ejabberdctl.template \
> 		> ejabberdctl.example
>-	[ -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) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
>+	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example
> 	#
> 	# Administration script
> 	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
>@@ -224,11 +221,13 @@
> 	chmod -R 750 $(LOGDIR)
> 	#
> 	# Documentation
>+ifndef NOPORTDOCS
> 	$(INSTALL) -d $(DOCDIR)
> 	[ -f doc/guide.html ] \
> 		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
> 		|| echo "Documentation not included in sources"
> 	$(INSTALL) -m 644 COPYING $(DOCDIR)
>+endif
> 
> uninstall: uninstall-binary
>

Actions: View | Diff

Attachments on bug 212328: 174311 | 174379 | 174450