diff options
Diffstat (limited to 'net-im/ejabberd/files/patch-Makefile.in')
| -rw-r--r-- | net-im/ejabberd/files/patch-Makefile.in | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in index 135a8b1c8cc9..17ad1cc02c47 100644 --- a/net-im/ejabberd/files/patch-Makefile.in +++ b/net-im/ejabberd/files/patch-Makefile.in @@ -1,41 +1,41 @@ ---- Makefile.in.orig 2023-01-17 10:35:52 UTC -+++ Makefile.in -@@ -22,7 +22,7 @@ SBINDIR = @sbindir@ +--- Makefile.in.orig 2024-11-30 22:51:34.482725000 +0100 ++++ Makefile.in 2024-11-30 22:57:25.793611000 +0100 +@@ -36,7 +36,7 @@ LIBDIR = @libdir@ - + # /lib/ejabberd/ -EJABBERDDIR = @libdir@/ejabberd +EJABBERDDIR = @libdir@/erlang/lib/ejabberd-$(PORTVERSION) - + # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ -@@ -66,7 +66,7 @@ SQLDIR = $(PRIVDIR)/sql +@@ -80,7 +80,7 @@ LUADIR = $(PRIVDIR)/lua - + # /var/lib/ejabberd/ -SPOOLDIR = @localstatedir@/lib/ejabberd +SPOOLDIR = @localstatedir@/spool/ejabberd - + # /var/log/ejabberd/ LOGDIR = @localstatedir@/log/ejabberd -@@ -205,7 +205,7 @@ DEPIX:=$(words $(subst /, ,$(DEPSDIR))) +@@ -283,7 +283,7 @@ LIBIX:=$(shell expr "$(DEPIX)" + 2) - + 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 X$(DEPSBASE)X,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word $(LIBIX),$(1))X),$(call DEPS_TO_DEST,$(wordlist $(DEPIX),1000,$(1))),$(call ELIXIR_TO_DEST,$(wordlist $(DEPIX),1000,$(1))))) TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(DESTDIR)$(call TO_DEST_SINGLE,$(subst /, ,$(path))))) -@@ -324,6 +324,7 @@ ejabberdctl.example: vars.config - -e "s*{{bindir}}*@bindir@*g" \ - -e "s*{{libdir}}*@libdir@*g" \ - -e "s*{{erl}}*@ERL@*g" \ +@@ -436,6 +436,7 @@ + -e "s*ERTS_VSN*# ERTS_VSN*g" \ + -e "s*{{iexpath}}*${IEX}*g" \ + -e "s*{{erl}}*${ERL}*g" \ + -e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \ - -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \ + -e "s*{{epmd}}*${EPMD}*g" ejabberdctl.template \ > ejabberdctl.example - -@@ -333,17 +334,13 @@ install: copy-files + +@@ -453,17 +454,13 @@ # # Configuration files $(INSTALL) -d -m 750 $(G_USER) $(DESTDIR)$(ETCDIR) @@ -57,7 +57,7 @@ # Elixir binaries [ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) [ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(DESTDIR)$(BINDIR)/iex || true -@@ -361,12 +358,14 @@ install: copy-files +@@ -481,12 +478,14 @@ chmod -R 750 $(DESTDIR)$(LOGDIR) # # Documentation @@ -69,6 +69,6 @@ || echo "Man page not included in sources" $(INSTALL) -m 644 COPYING $(DESTDIR)$(DOCDIR) +endif - - uninstall: uninstall-binary - + + #. + #' uninstall |