diff options
| author | Florian Diebold <flodiebold@gmail.com> | 2014-04-19 12:43:09 +0200 |
|---|---|---|
| committer | Florian Diebold <flodiebold@gmail.com> | 2014-04-26 12:23:37 +0200 |
| commit | c0ec6cfa46fdd39af0bfdbff64104ea1c5f86f8b (patch) | |
| tree | 841ac8350f43f06b140f432248f12985fff0fd17 | |
| parent | 4f3d0c6879f2baefcf3eb2749133ae3340dcbdca (diff) | |
| download | crawl-ref-c0ec6cfa46fdd39af0bfdbff64104ea1c5f86f8b.tar.gz crawl-ref-c0ec6cfa46fdd39af0bfdbff64104ea1c5f86f8b.zip | |
Make compilation work on Fedora 20 with the distribution lua.
In Fedora 20, lua 5.1 is in the compat-lua package and is called
lua-5.1 in pkg-config.
| -rw-r--r-- | crawl-ref/INSTALL.txt | 3 | ||||
| -rw-r--r-- | crawl-ref/source/Makefile | 16 |
2 files changed, 12 insertions, 7 deletions
diff --git a/crawl-ref/INSTALL.txt b/crawl-ref/INSTALL.txt index 06a9ce4a66..23b36454de 100644 --- a/crawl-ref/INSTALL.txt +++ b/crawl-ref/INSTALL.txt @@ -138,7 +138,8 @@ yum install gcc gcc-c++ make bison flex ncurses-devel lua-devel sqlite-devel \ zlib-devel pkgconfig SDL-devel SDL_image-devel libpng-devel freetype-devel \ dejavu-sans-fonts dejavu-sans-mono-fonts (the last six are needed only for tile builds). As with Debian, this package -list avoids the need for the bundled "contribs". +list avoids the need for the bundled "contribs". For Fedora 20 or later, +replace lua-devel by compat-lua-devel. ccache can be installed with: yum install ccache diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index 687be0e6f1..e7db9b0e47 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -586,14 +586,18 @@ ifndef BUILD_LUA endif else ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),) - ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),) - BUILD_LUA = yes - else - ifeq ($(shell $(PKGCONFIG) lua --modversion | head -c 3),5.1) - LUA_PACKAGE = lua - else + ifneq ($(shell $(PKGCONFIG) lua-5.1 --exists || echo no),) + ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),) BUILD_LUA = yes + else + ifeq ($(shell $(PKGCONFIG) lua --modversion | head -c 3),5.1) + LUA_PACKAGE = lua + else + BUILD_LUA = yes + endif endif + else + LUA_PACKAGE = lua-5.1 endif else LUA_PACKAGE = lua5.1 |