From c09a187c50f2f74e89d4d0991bdbd2c6846cc707 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Sun, 22 Sep 2013 12:22:43 +0700 Subject: configury: install headers correctly. * Makefile.am (pkgmodincludedir): Remove. (nobase_pkginclude_HEADERS, pkgmodinclude_HEADERS): Move from here... (nobase_include_HEADERS, noinst_HEADERS): ...to here. Signed-off-by: Gary V. Vaughan --- Makefile.am | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 628bc092..c752ff24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -147,14 +147,10 @@ MOSTLYCLEANFILES += src/getopt.h src/getopt.h-t ## Modules. ## ## -------- ## -pkgmodincludedir= $(pkgincludedir)/modules - -ETAGS_ARGS = --regex='/M4BUILTIN_HANDLER[ \t]*)\([^)]*\)/\1/' - module_ldflags = -module $(AM_LDFLAGS) module_libadd = m4/libm4.la -pkgmodinclude_HEADERS = modules/m4.h +noinst_HEADERS = modules/m4.h pkglib_LTLIBRARIES = \ modules/gnu.la \ @@ -217,8 +213,7 @@ tests_time_la_SOURCES = modules/time.c lib_LTLIBRARIES += m4/libm4.la nobase_include_HEADERS = \ - m4/m4module.h -nobase_pkginclude_HEADERS = \ + m4/m4module.h \ m4/hash.h \ m4/system.h m4_libm4_la_SOURCES = \ @@ -266,7 +261,7 @@ $(srcdir)/doc/m4.1: .version $(srcdir)/src/main.c TAGS_FILES = $(infos_TEXINFOS) TAGS_DEPENDENCIES = $(TAGS_FILES) -ETAGS_ARGS += --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES) +ETAGS_ARGS = --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES) MAINTAINERCLEANFILES += $(dist_man_MANS) -- cgit v1.2.1