autotools: Fix generated files in tarball

Tweak the autogen.sh so the commands used do not create symlinks and
also remove the autom4te.cache dir that was not in the kmod-33 release.

This is v34-only since autotools was completely removed from master
branch.

Closes: https://github.com/kmod-project/kmod/issues/292
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/autogen.sh b/autogen.sh
index 33f363f066a8f50ba6b72f0ccb009ed359c8069a..e42a535422510b949f3c50cb7a82bc07eef6a03c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,13 +6,17 @@ oldpwd=$(pwd)
 
 if [ -n "$MESON_DIST_ROOT" ]; then
     topdir="$MESON_DIST_ROOT"
+    gtkdocize_args="--copy"
+    autoreconf_args=
 else
     topdir=$(dirname $0)
+    gtkdocize_args=
+    autoreconf_args="--symlink"
 fi
 
 cd $topdir
 
-gtkdocize --docdir libkmod/docs || NO_GTK_DOC="yes"
+gtkdocize ${gtkdocize_args} --docdir libkmod/docs || NO_GTK_DOC="yes"
 if [ "x$NO_GTK_DOC" = "xyes" ]
 then
        for f in libkmod/docs/gtk-doc.make m4/gtk-doc.m4
@@ -22,7 +26,7 @@ then
        done
 fi
 
-autoreconf --force --install --symlink
+autoreconf --force --install ${autoreconf_args}
 
 libdir() {
         echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)

diff --git a/meson.build b/meson.build
index d801337f0a8029e6fdda634a0711da57a19a7501..1b30e09b1fbf475607abbe3a8b7b6d7934a34486 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -548,7 +548,7 @@ endif
 # dist && autotools compat
 # ------------------------------------------------------------------------------
 
-meson.add_dist_script('autogen.sh')
+meson.add_dist_script('scripts/autogen-for-tarball.sh')
 
 # ------------------------------------------------------------------
 # documentation

diff --git a/scripts/autogen-for-tarball.sh b/scripts/autogen-for-tarball.sh
new file mode 100755 (executable)
index 0000000..4ea8436
--- /dev/null
+++ b/scripts/autogen-for-tarball.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd "$MESON_DIST_ROOT"
+./autogen.sh
+rm -rf autom4te.cache