Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/10925 )
Change subject: Install sample cfg file to /etc/osmocom
......................................................................
Install sample cfg file to /etc/osmocom
Change-Id: I48ddd65125f25ac9f2d03bd43e7ab0a0bcf18196
---
M Makefile.am
M configure.ac
M debian/osmo-sip-connector.install
A doc/Makefile.am
A doc/examples/Makefile.am
5 files changed, 13 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index 7c1e00c..84b252a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
-SUBDIRS = src tests contrib
+SUBDIRS = src tests contrib doc
BUILT_SOURCES = $(top_srcdir)/.version
EXTRA_DIST = git-version-gen osmoappdesc.py .version
diff --git a/configure.ac b/configure.ac
index 1514faa..98fdc94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,4 +91,6 @@
tests/Makefile
contrib/Makefile
contrib/systemd/Makefile
+ doc/Makefile
+ doc/examples/Makefile
Makefile)
diff --git a/debian/osmo-sip-connector.install
b/debian/osmo-sip-connector.install
index b776fda..335531f 100644
--- a/debian/osmo-sip-connector.install
+++ b/debian/osmo-sip-connector.install
@@ -1,2 +1,4 @@
+etc/osmocom/osmo-sip-connector.cfg
lib/systemd/system/osmo-sip-connector.service
usr/bin/osmo-sip-connector
+usr/share/doc/osmo-sip-connector/examples/osmo-sip-connector/osmo-sip-connector.cfg
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..aee2d7b
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = examples
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
new file mode 100644
index 0000000..d3b851f
--- /dev/null
+++ b/doc/examples/Makefile.am
@@ -0,0 +1,7 @@
+examples_sipcdir = $(docdir)/examples/osmo-sip-connector
+examples_sipc_DATA = osmo-sip-connector.cfg
+
+osmoconfdir = $(sysconfdir)/osmocom
+osmoconf_DATA = osmo-sip-connector.cfg
+
+EXTRA_DIST = osmo-sip-connector.cfg
--
To view, visit https://gerrit.osmocom.org/10925
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I48ddd65125f25ac9f2d03bd43e7ab0a0bcf18196
Gerrit-Change-Number: 10925
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
