diff options
| author | Erik Martin-Dorel <erik.martin-dorel@irit.fr> | 2017-08-01 11:20:23 +0200 |
|---|---|---|
| committer | Erik Martin-Dorel <erik.martin-dorel@irit.fr> | 2018-01-02 22:09:08 +0100 |
| commit | e6efb4b810020bcc6643fc76b746969ba2334f13 (patch) | |
| tree | bc15be4b274830cb75031babb558d5d0708fc579 /src | |
| parent | 764cdb821e231e8eb30e79b5f68e4ccf4fb2e09e (diff) | |
| download | unison-e6efb4b810020bcc6643fc76b746969ba2334f13.zip unison-e6efb4b810020bcc6643fc76b746969ba2334f13.tar.gz unison-e6efb4b810020bcc6643fc76b746969ba2334f13.tar.bz2 | |
Fix detection of lablgtk2 with OPAM
There was a bug due to the location of lib dirs, which differs between
system-wide and OPAM-based installations of OCaml.
Tested on Debian GNU/Linux stable:
1. either using the Debian packages for OCaml and lablgtk2;
2. or using OPAM:
$ opam switch 4.05.0
$ eval `opam config env`
$ opam install lablgtk ocamlfind
$ make text
$ make src
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.OCaml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml index ca9518a..7cefa2e 100644 --- a/src/Makefile.OCaml +++ b/src/Makefile.OCaml @@ -83,8 +83,13 @@ else ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB)) UISTYLE=gtk2 else - UISTYLE=text -endif + LABLGTK2LIB=$(abspath $(OCAMLLIBDIR)/../lablgtk2) + ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB)) + UISTYLE=gtk2 + else + UISTYLE=text + endif + endif endif buildexecutable:: @echo UISTYLE = $(UISTYLE) |