summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2014-09-27 15:47:48 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2014-10-20 01:18:15 +0200
commit325822a0057e70c96f82411ffd1da8eb88eecef7 (patch)
tree2fb27bde324fda56c2a482e1c1e351fd535ef9c1
parent008d37bdca6d6be754bb90f37a36b4869e5ebfa7 (diff)
downloadneard-325822a0057e70c96f82411ffd1da8eb88eecef7.tar.gz
neard-325822a0057e70c96f82411ffd1da8eb88eecef7.tar.bz2
neard-325822a0057e70c96f82411ffd1da8eb88eecef7.zip
build: Install aclocal files into an m4 directory
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am2
-rwxr-xr-xbootstrap1
-rw-r--r--configure.ac1
4 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 44fc750..57f5a55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ compile
install-sh
libtool
ltmain.sh
+m4/
missing
stamp-h1
autom4te.cache
diff --git a/Makefile.am b/Makefile.am
index d614b75..ad25ba3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,6 @@
+ACLOCAL_AMFLAGS = -I m4
+
AM_MAKEFLAGS = --no-print-directory
pkgincludedir = ${includedir}/near
diff --git a/bootstrap b/bootstrap
index 72240f7..cb2974e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,5 @@
#!/bin/sh
+mkdir -p m4
autoreconf -fi
rm -Rf autom4te.cache
diff --git a/configure.ac b/configure.ac
index 7de72b0..0f198a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
AC_PREREQ(2.60)
AC_INIT(neard, 0.14, [linux-nfc@lists.01.org])
+AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
AC_CONFIG_HEADERS(config.h)