<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11546">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  daniel: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Install cfg files with autotools<br><br>Cfg files are moved to doc/examples like in other osmocom projects.<br>All the cfg files get installed into<br>$prefix/share/doc/osmo-pcap/examples/$subdir/, and 1 script per binary is<br>installed into /etc/osmocom.<br><br>Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66<br>---<br>M Makefile.am<br>M configure.ac<br>M contrib/Makefile.am<br>M debian/osmo-pcap-client.install<br>M debian/osmo-pcap-server.install<br>M debian/rules<br>A doc/Makefile.am<br>A doc/examples/Makefile.am<br>R doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg<br>R doc/examples/osmo-pcap-client/osmo-pcap-client.cfg<br>R doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg<br>R doc/examples/osmo-pcap-server/osmo-pcap-server.cfg<br>12 files changed, 40 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index 0f4a249..1dd1ff4 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -1,6 +1,6 @@</span><br><span> AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = include src contrib tests</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = include src contrib doc tests</span><br><span> </span><br><span> BUILT_SOURCES = $(top_srcdir)/.version</span><br><span> EXTRA_DIST = git-version-gen .version</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index f885e6d..95c5270 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -145,5 +145,7 @@</span><br><span>     src/Makefile</span><br><span>     contrib/Makefile</span><br><span>     contrib/systemd/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+    doc/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+    doc/examples/Makefile</span><br><span>     tests/Makefile</span><br><span>     Makefile)</span><br><span>diff --git a/contrib/Makefile.am b/contrib/Makefile.am</span><br><span>index 7bd8c23..e1927a7 100644</span><br><span>--- a/contrib/Makefile.am</span><br><span>+++ b/contrib/Makefile.am</span><br><span>@@ -1,3 +1,2 @@</span><br><span> SUBDIRS = systemd</span><br><span> dist_pkgdata_DATA = osmo_pcap_clean_old</span><br><span style="color: hsl(0, 100%, 40%);">-EXTRA_DIST = osmo-pcap-server.cfg osmo-pcap-client.cfg</span><br><span>diff --git a/debian/osmo-pcap-client.install b/debian/osmo-pcap-client.install</span><br><span>index ac7c65c..ef6576e 100644</span><br><span>--- a/debian/osmo-pcap-client.install</span><br><span>+++ b/debian/osmo-pcap-client.install</span><br><span>@@ -1,2 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+etc/osmocom/osmo-pcap-client.cfg</span><br><span> lib/systemd/system/osmo-pcap-client.service</span><br><span> usr/bin/osmo-pcap-client</span><br><span style="color: hsl(120, 100%, 40%);">+usr/share/doc/osmo-pcap/examples/osmo-pcap-client/osmo-pcap-client.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+usr/share/doc/osmo-pcap/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg</span><br><span>diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install</span><br><span>index 6ba698e..cedee92 100644</span><br><span>--- a/debian/osmo-pcap-server.install</span><br><span>+++ b/debian/osmo-pcap-server.install</span><br><span>@@ -1,2 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+etc/osmocom/osmo-pcap-server.cfg</span><br><span> lib/systemd/system/osmo-pcap-server.service</span><br><span> usr/bin/osmo-pcap-server</span><br><span style="color: hsl(120, 100%, 40%);">+usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index a9a8b30..90bd79e 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -21,17 +21,6 @@</span><br><span>            PCAP_CFLAGS=$(PCAP_CFLAGS) \</span><br><span>                 PCAP_LIBS=$(PCAP_LIBS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-override_dh_auto_install:</span><br><span style="color: hsl(0, 100%, 40%);">-     dh_auto_install $@</span><br><span style="color: hsl(0, 100%, 40%);">-      install -d -m 0755 $(CURDIR)/debian/osmo-pcap-client/etc/osmo-pcap/</span><br><span style="color: hsl(0, 100%, 40%);">-     install -m 0644 $(CURDIR)/contrib/osmo-pcap-client.cfg $(CURDIR)/debian/osmo-pcap-client/etc/osmo-pcap</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  install -d -m 0755 $(CURDIR)/debian/osmo-pcap-server/etc/osmo-pcap/</span><br><span style="color: hsl(0, 100%, 40%);">-     install -m 0644 $(CURDIR)/contrib/osmo-pcap-server.cfg $(CURDIR)/debian/osmo-pcap-server/etc/osmo-pcap</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  install -d -m 0755 $(CURDIR)/debian/osmo-pcap-server/etc/cron.daily/</span><br><span style="color: hsl(0, 100%, 40%);">-    install -m 0755 $(CURDIR)/contrib/osmo_pcap_clean_old $(CURDIR)/debian/osmo-pcap-server/etc/cron.daily/</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> override_dh_strip:</span><br><span>        dh_strip -posmo-pcap-client --dbg-package=osmo-pcap-client-dbg</span><br><span>       dh_strip -posmo-pcap-server --dbg-package=osmo-pcap-server-dbg</span><br><span>diff --git a/doc/Makefile.am b/doc/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..aee2d7b</span><br><span>--- /dev/null</span><br><span>+++ b/doc/Makefile.am</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = examples</span><br><span>diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..9337c9e</span><br><span>--- /dev/null</span><br><span>+++ b/doc/examples/Makefile.am</span><br><span>@@ -0,0 +1,30 @@</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES = \</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo-pcap-client/osmo-pcap-client.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo-pcap-server/osmo-pcap-server.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmoconfdir = $(sysconfdir)/osmocom</span><br><span style="color: hsl(120, 100%, 40%);">+osmoconf_DATA = $(OSMOCONF_FILES)</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = $(OSMOCONF_FILES)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+dist-hook:</span><br><span style="color: hsl(120, 100%, 40%);">+  for f in $$($(CFG_FILES)); do \</span><br><span style="color: hsl(120, 100%, 40%);">+               j="$(distdir)/$$f" && \</span><br><span style="color: hsl(120, 100%, 40%);">+             mkdir -p "$$(dirname $$j)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+             $(INSTALL_DATA) $(srcdir)/$$f $$j; \</span><br><span style="color: hsl(120, 100%, 40%);">+  done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+install-data-hook:</span><br><span style="color: hsl(120, 100%, 40%);">+    for f in $$($(CFG_FILES)); do \</span><br><span style="color: hsl(120, 100%, 40%);">+               j="$(DESTDIR)$(docdir)/examples/$$f" && \</span><br><span style="color: hsl(120, 100%, 40%);">+           mkdir -p "$$(dirname $$j)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+             $(INSTALL_DATA) $(srcdir)/$$f $$j; \</span><br><span style="color: hsl(120, 100%, 40%);">+  done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+uninstall-hook:</span><br><span style="color: hsl(120, 100%, 40%);">+       @$(PRE_UNINSTALL)</span><br><span style="color: hsl(120, 100%, 40%);">+     for f in $$($(CFG_FILES)); do \</span><br><span style="color: hsl(120, 100%, 40%);">+               j="$(DESTDIR)$(docdir)/examples/$$f" && \</span><br><span style="color: hsl(120, 100%, 40%);">+           $(RM) $$j; \</span><br><span style="color: hsl(120, 100%, 40%);">+  done</span><br><span>diff --git a/contrib/osmo-pcap-client-tls.cfg b/doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg</span><br><span>similarity index 100%</span><br><span>rename from contrib/osmo-pcap-client-tls.cfg</span><br><span>rename to doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg</span><br><span>diff --git a/contrib/osmo-pcap-client.cfg b/doc/examples/osmo-pcap-client/osmo-pcap-client.cfg</span><br><span>similarity index 100%</span><br><span>rename from contrib/osmo-pcap-client.cfg</span><br><span>rename to doc/examples/osmo-pcap-client/osmo-pcap-client.cfg</span><br><span>diff --git a/contrib/osmo-pcap-server-tls.cfg b/doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg</span><br><span>similarity index 100%</span><br><span>rename from contrib/osmo-pcap-server-tls.cfg</span><br><span>rename to doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg</span><br><span>diff --git a/contrib/osmo-pcap-server.cfg b/doc/examples/osmo-pcap-server/osmo-pcap-server.cfg</span><br><span>similarity index 100%</span><br><span>rename from contrib/osmo-pcap-server.cfg</span><br><span>rename to doc/examples/osmo-pcap-server/osmo-pcap-server.cfg</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11546">change 11546</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11546"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 </div>
<div style="display:none"> Gerrit-Change-Number: 11546 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>