Files
poky/meta/recipes-devtools/syslinux/files/cross-build.patch
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00

65 lines
1.3 KiB
Diff

Use ?= for Makefile variables to use poky environment variables.
Original method to sed s/CC =/CC ?=/ is not applicable anymore
because of the Makefile changes.
against 3.86
06/28/2010 - qhe
also AUXDIR stays in $(LIBDIR)/syslinux rather than $(DATADIR)/syslinux
07/08/2010 - qhe
---
diff --git a/MCONFIG b/MCONFIG
index e9c16d3..4d49f33 100644
--- a/MCONFIG
+++ b/MCONFIG
@@ -18,13 +18,13 @@
MAKEFLAGS += -r
MAKE += -r
-BINDIR = /usr/bin
-SBINDIR = /sbin
-LIBDIR = /usr/lib
-DATADIR = /usr/share
-AUXDIR = $(DATADIR)/syslinux
-MANDIR = /usr/man
-INCDIR = /usr/include
+BINDIR ?= /usr/bin
+SBINDIR ?= /sbin
+LIBDIR ?= /usr/lib
+DATADIR ?= /usr/share
+AUXDIR = $(LIBDIR)/syslinux
+MANDIR ?= /usr/man
+INCDIR ?= /usr/include
TFTPBOOT = /tftpboot
COM32DIR = $(AUXDIR)/com32
@@ -38,18 +38,18 @@ PERL = perl
CHMOD = chmod
-CC = gcc
+CC ?= gcc
gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \
if $(CC) $(1) -c $(topdir)/dummy.c -o $$tmpf 2>/dev/null ; \
then echo '$(1)'; else echo '$(2)'; fi; \
rm -f $$tmpf)
-LD = ld
-OBJDUMP = objdump
-OBJCOPY = objcopy
-AR = ar
-NM = nm
-RANLIB = ranlib
+LD ?= ld
+OBJDUMP ?= objdump
+OBJCOPY ?= objcopy
+AR ?= ar
+NM ?= nm
+RANLIB ?= ranlib
GZIPPROG = gzip
PNGTOPNM = pngtopnm
MCOPY = mcopy