diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-22 11:51:38 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-22 11:51:38 +0000 |
| commit | 8821237240c5374d83298b2da5ad88fa1e3c1ef7 (patch) | |
| tree | e1bc03fa83c61165f48ffe3f528ac5496332872a /sample/Makefile | |
| parent | 38dcca25c8855c95649e3f0b5b09fae862ed5c7a (diff) | |
| parent | 7307d60063ee4303da4de45f9d984fdc8df92146 (diff) | |
| download | syslinux-8821237240c5374d83298b2da5ad88fa1e3c1ef7.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/master' into baserock/morph
Diffstat (limited to 'sample/Makefile')
| -rw-r--r-- | sample/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sample/Makefile b/sample/Makefile index d7f439ca..9e504d96 100644 --- a/sample/Makefile +++ b/sample/Makefile @@ -15,7 +15,8 @@ ## topdir = .. -include $(topdir)/MCONFIG.embedded +MAKEDIR = $(topdir)/mk +include $(MAKEDIR)/embedded.mk PPMTOLSS16 = $(topdir)/utils/ppmtolss16 |