diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-09-05 22:24:45 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-09-05 22:43:45 +0200 |
| commit | 76bd17bba01eaeabc2ba689ec651714fc6754fa7 (patch) | |
| tree | b65a89e604801033021f5caa9c31c521649cb12a | |
| parent | 9fc286883d4a5e49889b1a2cc701509a3573317a (diff) | |
Move examples to doc/examples and include them in DIST
Change-Id: I0846e21ac63774939934ab629c6d7212269be9a6
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | contrib/osmo-ggsn.init (renamed from examples/osmo-ggsn.init) | 0 | ||||
| -rw-r--r-- | debian/osmo-ggsn.examples | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 5 | ||||
| -rw-r--r-- | doc/examples/Makefile.am | 22 | ||||
| -rwxr-xr-x | doc/examples/firewall (renamed from examples/firewall) | 0 | ||||
| -rw-r--r-- | doc/examples/osmo-ggsn.cfg (renamed from examples/osmo-ggsn.cfg) | 0 | ||||
| -rw-r--r-- | doc/examples/sgsnemu.conf (renamed from examples/sgsnemu.conf) | 0 |
8 files changed, 28 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e6b84fa..2b9343d 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,7 @@ PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) AC_CONFIG_FILES([Makefile doc/Makefile + doc/examples/Makefile ggsn/Makefile gtp/Makefile lib/Makefile diff --git a/examples/osmo-ggsn.init b/contrib/osmo-ggsn.init index 2deb378..2deb378 100644 --- a/examples/osmo-ggsn.init +++ b/contrib/osmo-ggsn.init diff --git a/debian/osmo-ggsn.examples b/debian/osmo-ggsn.examples index 3898d26..775b9cd 100644 --- a/debian/osmo-ggsn.examples +++ b/debian/osmo-ggsn.examples @@ -1,2 +1,2 @@ -examples/osmo-ggsn.conf -examples/sgsnemu.conf +doc/examples/osmo-ggsn.conf +doc/examples/sgsnemu.conf diff --git a/doc/Makefile.am b/doc/Makefile.am index 7e2246c..46c634e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,5 +2,6 @@ man_MANS = osmo-ggsn.8 sgsnemu.8 man_aux = $(man_MANS:.1=.x) EXTRA_DIST = $(man_MANS) - - +SUBDIRS = \ + examples \ + $(NULL) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..530c3fa --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,22 @@ +CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done diff --git a/examples/firewall b/doc/examples/firewall index fce735a..fce735a 100755 --- a/examples/firewall +++ b/doc/examples/firewall diff --git a/examples/osmo-ggsn.cfg b/doc/examples/osmo-ggsn.cfg index 763e561..763e561 100644 --- a/examples/osmo-ggsn.cfg +++ b/doc/examples/osmo-ggsn.cfg diff --git a/examples/sgsnemu.conf b/doc/examples/sgsnemu.conf index 43b2458..43b2458 100644 --- a/examples/sgsnemu.conf +++ b/doc/examples/sgsnemu.conf |