vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-11-08 Robert Millan <rmh@aybabtu.com>

Browse source 
* Makefile.in (PKGLIB): Add $(pkglib_BUILDDIR).
        (PKGDATA): Add $(pkgdata_SRCDIR).
        (pkglib_BUILDDIR): New variable.
        (pkgdata_SRCDIR): New variable.
        (build_env.mk): New target.
        (include_DATA): New variable.
        (install-local): Install $(include_DATA) files in $(includedir).
This commit is contained in:
robertmh 2008-11-08 11:29:53 +00:00
parent d99d46f105
commit 37c86336bf
2 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-11-08 Robert Millan <rmh@aybabtu.com>
* Makefile.in (PKGLIB): Add $(pkglib_BUILDDIR).
(PKGDATA): Add $(pkgdata_SRCDIR).
(pkglib_BUILDDIR): New variable.
(pkgdata_SRCDIR): New variable.
(build_env.mk): New target.
(include_DATA): New variable.
(install-local): Install $(include_DATA) files in $(includedir).
2008-11-07 Pavel Roskin <proski@gnu.org> 2008-11-07 Pavel Roskin <proski@gnu.org>
* gendistlist.sh: Use C locale for sorting to ensure consistent * gendistlist.sh: Use C locale for sorting to ensure consistent

33
Makefile.in
View file

@ -105,8 +105,8 @@ RMKFILES = $(addprefix conf/,common.rmk i386-coreboot.rmk i386-efi.rmk \
MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES)) MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \ PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \
$(pkglib_DATA) $(lib_DATA) $(pkglib_DATA) $(lib_DATA) $(pkglib_BUILDDIR)
PKGDATA = $(pkgdata_DATA) PKGDATA = $(pkgdata_DATA) $(pkgdata_SRCDIR)
PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES) PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS) SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS)
@ -163,6 +163,22 @@ ascii.pff: $(UNIFONT_HEX)
ruby $(srcdir)/util/unifont2pff.rb 0x0-0x7f $(UNICODE_ARROWS) $(UNICODE_LINES) $(UNIFONT_HEX) > $@ ruby $(srcdir)/util/unifont2pff.rb 0x0-0x7f $(UNICODE_ARROWS) $(UNICODE_LINES) $(UNIFONT_HEX) > $@
endif endif
# Used for building modules externally
pkglib_BUILDDIR += build_env.mk
build_env.mk: Makefile
(\
echo "TARGET_CC=$(TARGET_CC)" ; \
echo "TARGET_CFLAGS=$(TARGET_CFLAGS)" ; \
echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(pkglibdir)" ; \
echo "STRIP=$(STRIP)" ; \
echo "COMMON_ASFLAGS=$(COMMON_ASFLAGS)" ; \
echo "COMMON_CFLAGS=$(COMMON_CFLAGS)" ; \
echo "COMMON_LDFLAGS=$(COMMON_LDFLAGS)"\
) > $@
pkglib_BUILDDIR += config.h grub_script.tab.h
pkgdata_SRCDIR += genmodsrc.sh genmk.rb
include_DATA += $(shell find include -name \*.h) include/grub/cpu
all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(MKFILES) all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(MKFILES)
install: install-local install: install-local
@ -175,6 +191,19 @@ install-local: all
dest="`echo $$file | sed 's,.*/,,'`"; \ dest="`echo $$file | sed 's,.*/,,'`"; \
$(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \ $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \
done done
$(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_DATA)'; \
for file in $$list; do \
if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
dest="`echo $$file | sed 's,include/,,'`"; \
destdir="`echo $$dest | sed 's,\(^\|/\)[^/]*$$,,g'`"; \
$(mkinstalldirs) $(DESTDIR)$(includedir)/$$destdir; \
if test -f "$$dir$$file"; then \
$(INSTALL_DATA) $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
elif test -L "$$dir$$file"; then \
cp -d $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
fi; \
done
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@list='$(PKGDATA)'; \ @list='$(PKGDATA)'; \
for file in $$list; do \ for file in $$list; do \