diff options
| author | Sergey Poznyakoff <gray@nxc.no> | 2017-08-19 20:57:43 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@nxc.no> | 2017-08-19 20:57:43 +0300 |
| commit | 82ee306d977e2fcb88277b85920b7863ead36312 (patch) | |
| tree | ee9a0aff1e1e6563595159dbab1f9beb0ef9e431 | |
| parent | 7ff78fe48baaf6a4fa24408f8327ef8ecb886a95 (diff) | |
| download | nssync-82ee306d977e2fcb88277b85920b7863ead36312.tar.gz nssync-82ee306d977e2fcb88277b85920b7863ead36312.tar.bz2 | |
Fix distcheck
* Makefile.am (ACLOCAL_AMFLAGS): Add runcap.
* configure.ac: Call RUNCAP_SETUP
* doc/Makefile.am (TEXI2DVI): Pass include files directory
* runcap: Update
* src/Makefile.am: Fix AM_CPPFLAGS
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| m--------- | grecs | 0 | ||||
| m--------- | runcap | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
6 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 1d84596..52e011b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with NSsync. If not, see <http://www.gnu.org/licenses/>. -ACLOCAL_AMFLAGS = -I grecs/am +ACLOCAL_AMFLAGS = -I grecs/am -I runcap SUBDIRS = grecs runcap src doc diff --git a/configure.ac b/configure.ac index f6091df..3e859ea 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,8 @@ fi GRECS_SETUP(grecs, [getopt git2chg parser-bind syntax-doc sockaddr-list json tree-api], [$(top_srcdir)/src/pp-setup]) +RUNCAP_SETUP([runcap],[static]) + AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile]) diff --git a/doc/Makefile.am b/doc/Makefile.am index bf693fb..afd9e14 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -28,7 +28,7 @@ clean-local: GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init' EXTRA_DIST += gendocs.sh -TEXI2DVI=texi2dvi -t '@set $(RENDITION)' +TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -I $(abs_top_srcdir)/@GRECS_SUBDIR@/doc AM_MAKEINFOFLAGS=-I $(abs_top_srcdir)/@GRECS_SUBDIR@/doc # Make sure you set TEXINPUTS. diff --git a/grecs b/grecs -Subproject 5938aedc98430070bc009c88696829462e7bd27 +Subproject 6020d6243c7fdf657da768b3fb2efa1244665d5 diff --git a/runcap b/runcap -Subproject ead370a83f981ccf3d288dbe222fd362ec801f7 +Subproject c820e80c6530b638b969fef5161102cb0427027 diff --git a/src/Makefile.am b/src/Makefile.am index 0397119..6d75cfc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,7 +47,7 @@ incdir=$(pkgdatadir)/$(VERSION)/include AM_CPPFLAGS= \ @GRECS_INCLUDES@\ - -I$(top_srcdir)/runcap\ + @RUNCAP_INC@\ -DSYSCONFDIR=\"$(sysconfdir)\"\ -DLOCALSTATEDIR=\"$(localstatedir)/$(PACKAGE)\"\ -DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\ |