blob: 7bb6bdae18b73a57f52aa7595632c99890e817ed (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
Upstream-Status: Inappropriate [configuration]
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
updated for 4.03
11/16/2010 - Qing He <qing.he@intel.com>
---
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) $(GCCOPT) $(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
|