]> granicus.if.org Git - ejabberd/commitdiff
Makefile.in: Substitute all @variables@ in a line
authorHolger Weiss <holger@zedat.fu-berlin.de>
Thu, 24 Nov 2016 06:55:06 +0000 (07:55 +0100)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Thu, 24 Nov 2016 06:55:06 +0000 (07:55 +0100)
There are now lines with multiple occurrences of the @ctlscriptpath@
variable in the ejabberd.service template.

Makefile.in

index 00fd4f62c72a994ef5f24ed1c6741fa033bcc85f..1cb1074a622d38a8913e90dec02356acb9bd9b1b 100644 (file)
@@ -173,15 +173,15 @@ install: all copy-files
        [ -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
-       $(SED) -e "s*{{rootdir}}*@prefix@*" \
-               -e "s*{{installuser}}*@INSTALLUSER@*" \
-               -e "s*{{bindir}}*@bindir@*" \
-               -e "s*{{libdir}}*@libdir@*" \
-               -e "s*{{sysconfdir}}*@sysconfdir@*" \
-               -e "s*{{localstatedir}}*@localstatedir@*" \
-               -e "s*{{docdir}}*@docdir@*" \
-               -e "s*{{erl}}*@ERL@*" \
-               -e "s*{{epmd}}*@EPMD@*" ejabberdctl.template \
+       $(SED) -e "s*{{rootdir}}*@prefix@*g" \
+               -e "s*{{installuser}}*@INSTALLUSER@*g" \
+               -e "s*{{bindir}}*@bindir@*g" \
+               -e "s*{{libdir}}*@libdir@*g" \
+               -e "s*{{sysconfdir}}*@sysconfdir@*g" \
+               -e "s*{{localstatedir}}*@localstatedir@*g" \
+               -e "s*{{docdir}}*@docdir@*g" \
+               -e "s*{{erl}}*@ERL@*g" \
+               -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
                > ejabberdctl.example
        [ -f $(ETCDIR)/ejabberdctl.cfg ] \
                && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
@@ -198,13 +198,13 @@ install: all copy-files
        [ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
        #
        # Init script
-       $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
-               -e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \
+       $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
+               -e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
                > ejabberd.init
        chmod 755 ejabberd.init
        #
        # Service script
-       $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" ejabberd.service.template \
+       $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
                > ejabberd.service
        chmod 755 ejabberd.service
        #