diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-06-26 17:43:37 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-06-26 17:43:37 +0200 |
| commit | 4b930ded8391c7552820f8f162b4e6ceebf50ca4 (patch) | |
| tree | 9d3a81fb3a9c6ee3ca4780df6f0514dd2ea17bbe /Makefile.am | |
| parent | 68ce459f2fadd3f8aa6e083b4823b37116394956 (diff) | |
catalog: make support URL to show in shipped catalog entries configurable (#3597)
Let's allow distros to change the support URL to expose in catalog entries by
default. It doesn't make sense to direct end-users to the upstream project for
common errors.
This adds a --with-support-url= switch to configure, which allows overriding
the default at build-time.
Fixes: #2516
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index dd62affded..2206b70c95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4144,7 +4144,7 @@ test_catalog_SOURCES = \ test_catalog_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\" + -DCATALOG_DIR=\"$(abs_top_builddir)/catalog\" test_catalog_LDADD = \ libjournal-core.la @@ -4343,7 +4343,7 @@ nodist_systemunit_DATA += \ dist_pkgsysconf_DATA += \ src/journal/journald.conf -dist_catalog_DATA = \ +nodist_catalog_DATA = \ catalog/systemd.bg.catalog \ catalog/systemd.be.catalog \ catalog/systemd.be@latin.catalog \ @@ -4356,6 +4356,16 @@ dist_catalog_DATA = \ catalog/systemd.zh_TW.catalog \ catalog/systemd.catalog +EXTRA_DIST += \ + $(nodist_catalog_DATA:.catalog=.catalog.in) + +# Note that we don't use @@ for replacement markers here, but %%. This is +# because the catalog uses @@ already for its runtime replacement handling and +# we don't want to conflict with that. +catalog/%.catalog: catalog/%.catalog.in + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(SED) -e 's~%SUPPORT_URL%~$(SUPPORT_URL)~' < $< > $@ + SOCKETS_TARGET_WANTS += \ systemd-journald.socket \ systemd-journald-dev-log.socket \ |