diff mbox

[2/2] build: fix "make distcheck"

Message ID 1431886004-815-3-git-send-email-mail@rotty.xx.vu
State Accepted
Headers show

Commit Message

mail@rotty.xx.vu May 17, 2015, 6:06 p.m. UTC
From: Andreas Rottmann <a.rottmann@gmx.at>

Running "make distcheck" failed trying to generate ".version" into the
read-only unpacked source directory:

  make[1]: Entering directory '/tmp/build/libosmo-netif-0.0.4.10-7d1d/_build'
  echo 0.0.4.10-7d1d > ../.version-t && mv ../.version-t ../.version
  /bin/bash: ../.version-t: Permission denied
  Makefile:877: recipe for target '../.version' failed

Actually shipping ".version" in the tarball fixes that.
---
 Makefile.am  | 2 ++
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/Makefile.am b/Makefile.am
index 519d1ae..7b43d4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,8 @@  SUBDIRS = include src examples tests
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libosmo-netif.pc
 
+EXTRA_DIST = .version
+
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
diff --git a/configure.ac b/configure.ac
index 47fba65..a7fe334 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@  AC_INIT([libosmo-netif],
 	m4_esyscmd([./git-version-gen .tarball-version]),
 	[openbsc-devel@lists.openbsc.org])
 
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([subdir-objects dist-bzip2])
 AC_CONFIG_TESTDIR(tests)
 
 dnl kernel style compile messages