2009-06-11 Pavel Roskin <proski@gnu.org>

	* Makefile.in: Rename lib_DATA to lib_SCRIPTS, move it from
	PKGLIB to SCRIPTS.  This fixes installation of grub-mkconfig_lib
	and update-grub_lib in two places.
	* conf/common.rmk: Rename lib_DATA to lib_SCRIPTS.

diff --git a/ChangeLog b/ChangeLog
index d99396d93ac0b2ae6dc152654be6180aa23fb482..9c69b13b95331fd9bb6512ad5442a7685d61914a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-06-11  Pavel Roskin  <proski@gnu.org>
 
+       * Makefile.in: Rename lib_DATA to lib_SCRIPTS, move it from
+       PKGLIB to SCRIPTS.  This fixes installation of grub-mkconfig_lib
+       and update-grub_lib in two places.
+       * conf/common.rmk: Rename lib_DATA to lib_SCRIPTS.
+
        * disk/usbms.c (grub_usbms_transfer): Initialize `err' to fix
        a compiler warning.
 

diff --git a/Makefile.in b/Makefile.in
index 6774174435ab84c8cbd6b0b87af9d1a380a23fb1..40bc140fa2fa9b6c9df657edd1c31029d8ada530 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,10 +118,11 @@ RMKFILES = $(addprefix conf/,common.rmk i386-coreboot.rmk i386-efi.rmk \
 MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
 
 PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \
-       $(pkglib_DATA) $(lib_DATA) $(pkglib_BUILDDIR)
+       $(pkglib_DATA) $(pkglib_BUILDDIR)
 PKGDATA = $(pkgdata_DATA) $(pkgdata_SRCDIR)
 PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
-SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS) \
+       $(lib_SCRIPTS)
 
 CLEANFILES =
 MOSTLYCLEANFILES =
@@ -277,7 +278,7 @@ install-local: all
          $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
        done
        $(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/grub
-       @list='$(lib_DATA)'; \
+       @list='$(lib_SCRIPTS)'; \
        for file in $$list; do \
          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
          dest="`echo $$file | sed 's,.*/,,'`"; \
@@ -315,7 +316,7 @@ uninstall:
          dest="`echo $$file | sed 's,include/,,'`"; \
          rm -f $(DESTDIR)$(includedir)/$$dest; \
        done
-       @list='$(lib_DATA)'; \
+       @list='$(lib_SCRIPTS)'; \
        for file in $$list; do \
          dest="`echo $$file | sed 's,.*/,,'`"; \
          echo rm -f $(DESTDIR)$(libdir)/$$dest; \

diff --git a/conf/common.rmk b/conf/common.rmk
index 2dcf2d628cd854f4747f605def72332cfab989a5..3d74f902d7ed2a2dd0750af9d8c4acf223919a4d 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -145,13 +145,13 @@ CLEANFILES += grub-mkconfig
 grub-mkconfig_lib: util/grub-mkconfig_lib.in config.status
        ./config.status --file=$@:$<
        chmod +x $@
-lib_DATA += grub-mkconfig_lib
+lib_SCRIPTS += grub-mkconfig_lib
 CLEANFILES += grub-mkconfig_lib
 
 update-grub_lib: util/update-grub_lib.in config.status
        ./config.status --file=$@:$<
        chmod +x $@
-lib_DATA += update-grub_lib
+lib_SCRIPTS += update-grub_lib
 CLEANFILES += update-grub_lib
 
 %: util/grub.d/%.in config.status