diff options
| author | Matan Bareket | 2018-12-18 20:09:09 -0500 |
|---|---|---|
| committer | Matan Bareket | 2018-12-25 11:37:26 -0500 |
| commit | 08d48e9f2c3613b68899e3af7d2ce00b3ca49bb5 (patch) | |
| tree | e793f2d2cda58ba04392fd67bab5f3cd328de6d7 | |
| parent | 9f19b34bac4a8165edc881a6b879f7a1dba87ace (diff) | |
| download | scummvm-rg350-08d48e9f2c3613b68899e3af7d2ce00b3ca49bb5.tar.gz scummvm-rg350-08d48e9f2c3613b68899e3af7d2ce00b3ca49bb5.tar.bz2 scummvm-rg350-08d48e9f2c3613b68899e3af7d2ce00b3ca49bb5.zip | |
BUILD: Copy README.md instead of README
| -rw-r--r-- | Makefile.common | 12 | ||||
| -rw-r--r-- | backends/platform/sdl/win32/win32.mk | 2 | ||||
| -rwxr-xr-x | configure | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index 9132a20e21..2a0490d8fa 100644 --- a/Makefile.common +++ b/Makefile.common @@ -6,12 +6,16 @@ # The default build target: just build the scummvm executable ###################################################################### -all: $(EXECUTABLE) plugins readme +all: $(EXECUTABLE) plugins ifdef SPLIT_DWARF all: $(EXECUTABLE).dwp endif +ifdef USE_PANDOC +all: readme +endif + ###################################################################### # Module settings ###################################################################### @@ -225,11 +229,11 @@ DISTNAME := scummvm-$(DISTVERSION) DISTDIR := dist VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h -#ifdef USE_PANDOC +ifdef USE_PANDOC # Convert README.md to plain text for any platform that might require it readme: README.md - $(QUIET_PANDOC)pandoc $(PANDOCFLAGS) -#endif + $(QUIET_PANDOC)$(PANDOC) $(PANDOCFLAGS) +endif # TODO git via $(GITROOT) $(VERFILE): $(srcdir)/base/internal_version.h diff --git a/backends/platform/sdl/win32/win32.mk b/backends/platform/sdl/win32/win32.mk index 7ff6fdd1e7..f878a9d755 100644 --- a/backends/platform/sdl/win32/win32.mk +++ b/backends/platform/sdl/win32/win32.mk @@ -36,7 +36,7 @@ win32dist: all cp $(srcdir)/doc/da/HurtigStart $(WIN32PATH)/doc/da/HurtigStart.txt cp $(srcdir)/doc/de/Schnellstart $(WIN32PATH)/doc/de/Schnellstart.txt cp $(srcdir)/doc/se/Snabbstart $(WIN32PATH)/doc/se/Snabbstart.txt - cp $(srcdir)/README $(WIN32PATH)/README.txt + cp $(srcdir)/README.md $(WIN32PATH)/README.md cp $(WIN32SDLDOCPATH)/README-SDL.txt $(WIN32PATH)/README-SDL.txt cp $(srcdir)/doc/de/LIESMICH $(WIN32PATH)/doc/de/LIESMICH.txt cp $(srcdir)/doc/se/LasMig $(WIN32PATH)/doc/se/LasMig.txt @@ -5578,6 +5578,7 @@ EXEPRE := $HOSTEXEPRE EXEEXT := $HOSTEXEEXT NASM := $NASM NASMFLAGS := $NASMFLAGS +PANDOC := $PANDOC PANDOCFLAGS := $PANDOCFLAGS ZLIB_LIBS := $ZLIB_LIBS ZLIB_CFLAGS := $ZLIB_CFLAGS |