remove include_dir hack

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5608 ec53bebd-3082-4978-b11e-865c3cabbd6b

cf/Makefile.am.common

@@ -13,10 +13,8 @@ COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
 ## ugly hack for brokenness in automake, you can't install built
 ## headers via _HEADERS, and you can't install _DATA in includedir.
 
-## set include__DATA to built headers that should be installed
 ## set build_HEADERZ to headers that should just be installed in build tree
 
-include_dir = $(includedir)
 buildinclude = $(top_builddir)/include
 
 ## these aren't detected by automake
@@ -45,7 +43,7 @@ install-suid-programs:
 install-exec-hook: install-suid-programs
 
 install-build-headers: 
-	@foo='$(include__DATA) $(include_HEADERS) $(build_HEADERZ)'; \
+	@foo='$(include_HEADERS) $(build_HEADERZ)'; \
 	for f in $$foo; do \
 		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
 		else file="$$f"; fi; \

include/Makefile.am

@@ -8,7 +8,7 @@ noinst_PROGRAMS = bits
 
 INCLUDES = -DHOST=\"$(CANONICAL_HOST)\"
 
-include__DATA = krb5-types.h
+include_HEADERS = krb5-types.h
 
 krb5-types.h: bits
 	./bits krb5-types.h

lib/asn1/Makefile.am

@@ -124,9 +124,7 @@ TESTS = check-der
 
 CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) $(foo) asn1_files
 
-include__DATA = asn1.h asn1_err.h
-
-include_HEADERS = der.h
+include_HEADERS = asn1.h asn1_err.h der.h
 
 lex.lo: parse.h
 

lib/hdb/Makefile.am

@@ -23,8 +23,7 @@ lib_LTLIBRARIES = libhdb.la
 
 libhdb_la_SOURCES = hdb.c common.c db.c ndbm.c $(BUILT_SOURCES)
 
-include_HEADERS = hdb.h
-include__DATA = hdb_err.h hdb_asn1.h
+include_HEADERS = hdb.h hdb_err.h hdb_asn1.h
 
 libhdb_la_LIBADD = 
 

lib/krb5/Makefile.am

@@ -104,8 +104,7 @@ man_MANS = krb5.conf.5 krb5_warn.3 krb5_openlog.3 \
 	krb5_425_conv_principal.3 krb5_build_principal.3 krb5_free_principal.3 \
 	krb5_parse_name.3 krb5_sname_to_principal.3 krb5_unparse_name.3
 
-include_HEADERS = krb5.h krb5-protos.h
-include__DATA = krb5_err.h heim_err.h
+include_HEADERS = krb5.h krb5-protos.h krb5_err.h heim_err.h
 
 CLEANFILES = krb5_err.c krb5_err.h heim_err.c heim_err.h
 

lib/roken/Makefile.am

@@ -109,10 +109,8 @@ libroken_la_LIBADD = @LTLIBOBJS@
 
 $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h
 
-include_HEADERS = base64.h getarg.h parse_time.h parse_units.h \
-	resolve.h roken-common.h
-
-include__DATA = roken.h
+include_HEADERS = $(err_h) base64.h getarg.h parse_time.h parse_units.h \
+	resolve.h roken.h roken-common.h
 
 build_HEADERZ = $(err_h) $(fnmatch_h) $(glob_h) xdbm.h