2009-09-28 Robert Millan <rmh.grub@aybabtu.com>

        Do not automatically install headers.

        * Makefile.in (include_DATA): Remove.  Update all users.

diff --git a/ChangeLog b/ChangeLog
index aca4ef788078540202e1aafd79eb687a4b1d5f91..394470abc954debf6a4599d12eaf7e011ee2808f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-28  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Do not automatically install headers.
+
+       * Makefile.in (include_DATA): Remove.  Update all users.
+
 2009-09-26  Robert Millan  <rmh.grub@aybabtu.com>
 
        * conf/common.rmk (pkglib_MODULES): Remove `lua.mod'.

diff --git a/Makefile.in b/Makefile.in
index 363d696f12ffab29f470b2e8dfc3ad06a53dc0b3..0c5d0abb3be4b9bb308e211d407ff386b96baf41 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -233,8 +233,6 @@ build_env.mk: Makefile
        echo "COMMON_LDFLAGS=$(COMMON_LDFLAGS)"\
        ) > $@
 pkglib_BUILDDIR += config.h grub_script.tab.h
-include_DATA += $(shell find $(srcdir)/include -name \*.h | sed -e "s,^$(srcdir)/,,g") \
-       include/grub/cpu include/grub/machine
 
 all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES)
 
@@ -249,20 +247,6 @@ install-local: all
          dest="`echo $$file | sed 's,.*/,,'`"; \
          $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \
        done
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(includedir)
-       @list='$(include_DATA)'; \
-       for file in $$list; do \
-         if test -e "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,include/,,'`"; \
-         destdir="`echo $$dest | sed 's,[^/]*$$,,g'`"; \
-         $(SHELL) $(mkinstalldirs) $(DESTDIR)$(includedir)/$$destdir; \
-         if test -f "$$dir$$file"; then \
-           $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
-         elif test -L "$$dir$$file"; then \
-           rm -rf $(DESTDIR)$(includedir)/$$dest && \
-           cp -fR $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
-         fi; \
-       done
        $(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
        @list='$(PKGDATA)'; \
        for file in $$list; do \
@@ -354,11 +338,6 @@ uninstall:
          dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
          rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
        done
-       @list='$(include_DATA)'; \
-       for file in $$list; do \
-         dest="`echo $$file | sed 's,include/,,'`"; \
-         rm -f $(DESTDIR)$(includedir)/$$dest; \
-       done
        @list='$(lib_SCRIPTS)'; \
        for file in $$list; do \
          dest="`echo $$file | sed 's,.*/,,'`"; \