freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] master ca01cba: * graph/x11/rules.mk (X11_LIB): Also a


From: Werner LEMBERG
Subject: [freetype2-demos] master ca01cba: * graph/x11/rules.mk (X11_LIB): Also append `/lib64'.
Date: Fri, 18 Mar 2016 07:26:21 +0000

branch: master
commit ca01cbaf2bcd2bedc2d9438161c3d3313af16a5c
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * graph/x11/rules.mk (X11_LIB): Also append `/lib64'.
---
 ChangeLog          |    4 ++++
 README             |    7 +++++++
 graph/x11/rules.mk |    3 ++-
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e12d21..16f0a77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-18  Werner Lemberg  <address@hidden>
+
+       * graph/x11/rules.mk (X11_LIB): Also append `/lib64'.
+
 2016-03-02  Werner Lemberg  <address@hidden>
 
        [ftgrid] Use colors for dot numbers.
diff --git a/README b/README
index 3454d8b..5a382a4 100644
--- a/README
+++ b/README
@@ -39,6 +39,13 @@ WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
WARNING WARNING
 
         make X11_PATH="/usr/openwin /usr/local/X11R6"
 
+    The build  system then derives  the X11_INCLUDE include  file path
+    from X11_PATH by appending `/include'  to all path components.  It
+    also derives the  X11_LIB library path from  X11_PATH by appending
+    `/lib64' and `/lib' to all  components (in that order).  You might
+    override  those  variables similar  to  X11_PATH  as arguments  to
+    `make'.
+
     If  you don't  have X11  at all,  fix the  definition of  the EXES
     variable as described in the top-level Makefile.
 
diff --git a/graph/x11/rules.mk b/graph/x11/rules.mk
index 39eab3b..c8a87ea 100644
--- a/graph/x11/rules.mk
+++ b/graph/x11/rules.mk
@@ -69,7 +69,8 @@ endif
 ifneq ($(X11_PATH),)
 
   X11_INCLUDE := $(subst /,$(COMPILER_SEP),$(X11_PATH:%=%/include))
-  X11_LIB     := $(subst /,$(COMPILER_SEP),$(X11_PATH:%=%/lib))
+  X11_LIB     := $(subst /,$(COMPILER_SEP),$(X11_PATH:%=%/lib64) \
+                                           $(X11_PATH:%=%/lib))
 
   # The GRAPH_LINK variable is expanded each time an executable is linked
   # against the graphics library.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]