diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-04-26 01:18:18 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-04-26 01:18:18 -0700 |
| commit | d5b9f24567a26562ec1822235cbd08256b96c335 (patch) | |
| tree | 8e5a4c6245652d9b610c6308d3f505cdf9292919 /linux | |
| parent | faf815967c276bab95989d22a62b8378d7ebf6f3 (diff) | |
| parent | 5b726ddd81fd77947e126b14c84fb843b63544c5 (diff) | |
| download | syslinux-d5b9f24567a26562ec1822235cbd08256b96c335.tar.gz | |
Merge remote-tracking branch 'mfleming/for-hpa/makefile-cleanup'
Resolved Conflicts:
com32/hdt/Makefile
com32/sysdump/Makefile
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/Makefile b/linux/Makefile index ffe22728..b9dac179 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -15,7 +15,8 @@ ## topdir = .. -include $(topdir)/MCONFIG +MAKEDIR = $(topdir)/mk +include $(MAKEDIR)/syslinux.mk OPTFLAGS = -g -O0 -Dalloca=malloc INCLUDES = -I. -I.. -I../libinstaller |