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.
This commit is contained in:
parent
e3b27c39fc
commit
ca0388f084
3 changed files with 12 additions and 6 deletions
|
@ -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.
|
||||
|
||||
|
|
|
@ -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; \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue