index 628bc0924f3d2f76a037d35e1a4d394926c5d1c3..c752ff24901acfeb0b34de072c5f054172a389ce 100644 (file)
 ## 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 \
 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)