From: Gary V. Vaughan <gary@gnu.org>
Date: 2013年9月22日 05:22:43 +0000 (+0700)
Subject: configury: install headers correctly.
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c09a187c50f2f74e89d4d0991bdbd2c6846cc707;p=m4.git
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 <gary@gnu.org>
---
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)
 
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain&amp;h=c09a187c50f2f74e89d4d0991bdbd2c6846cc707&amp;p=m4.git">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain&amp;h=c09a187c50f2f74e89d4d0991bdbd2c6846cc707&amp;p=m4.git" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>