commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[2316] 2009-06-11 Pavel Roskin <address@hidden>


From: Pavel Roskin
Subject: [2316] 2009-06-11 Pavel Roskin <address@hidden>
Date: Fri, 12 Jun 2009 02:10:22 +0000

Revision: 2316
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2316
Author:   proski
Date:     2009-06-12 02:10:21 +0000 (Fri, 12 Jun 2009)
Log Message:
-----------
2009-06-11  Pavel Roskin  <address@hidden>

        * 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/Makefile.in
    trunk/grub2/conf/common.rmk

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-11 22:14:54 UTC (rev 2315)
+++ trunk/grub2/ChangeLog       2009-06-12 02:10:21 UTC (rev 2316)
@@ -1,5 +1,10 @@
 2009-06-11  Pavel Roskin  <address@hidden>
 
+       * 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.
 

Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in     2009-06-11 22:14:54 UTC (rev 2315)
+++ trunk/grub2/Makefile.in     2009-06-12 02:10:21 UTC (rev 2316)
@@ -118,10 +118,11 @@
 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_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 @@
          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; \

Modified: trunk/grub2/conf/common.rmk
===================================================================
--- trunk/grub2/conf/common.rmk 2009-06-11 22:14:54 UTC (rev 2315)
+++ trunk/grub2/conf/common.rmk 2009-06-12 02:10:21 UTC (rev 2316)
@@ -145,13 +145,13 @@
 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





reply via email to

[Prev in Thread] Current Thread [Next in Thread]