ReFuel/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix typo in w32-vcc.mk

Browse Source 
allow direct setting of X11_PATH for unusual X11 paths.
This commit is contained in:
Werner Lemberg 2000-06-27 20:54:06 +00:00
parent b3880ddeaa
commit 314bf4a1f4
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/win32/w32-vcc.mk
View File

@ -1,5 +1,5 @@
#
# FreeType 2 Configuration rules for Win32 + LCC
# FreeType 2 Configuration rules for Win32 + Visual C/C++
#

40
demos/graph/x11/rules.mk
View File

@ -9,25 +9,37 @@
#
# Try to detect an X11 setup.
#
# We simply try to detect a `X11R6/bin', `X11R5/bin' or `X11/bin' in
# the current path.
# We try to detect the following directories (in that order) in the current
# path:
#
ifneq ($(findstring X11R6$(SEP)bin,$(PATH)),)
xversion := X11R6
else
ifneq ($(findstring X11R5$(SEP)bin,$(PATH)),)
xversion := X11R5
# X11 (usually a symlink to the current release)
# X11R6
# X11R5
#
# If the variable X11_PATH is set (to specify unusual locations of X11), no
# other directory is searched. More than one directory must be separated
# with spaces. Example:
#
# make X11_PATH="/usr/openwin /usr/local/X11R6"
#
ifndef X11_PATH
ifneq ($(findstring X11$(SEP)bin,$(PATH)),)
xversion := X11
else
ifneq ($(findstring X11$(SEP)bin,$(PATH)),)
xversion := X11
ifneq ($(findstring X11R6$(SEP)bin,$(PATH)),)
xversion := X11R6
else
ifneq ($(findstring X11R5$(SEP)bin,$(PATH)),)
xversion := X11R5
endif
endif
endif
endif
ifdef xversion
X11_PATH := $(subst ;, ,$(PATH)) $(subst :, ,$(PATH))
X11_PATH := $(filter %$(xversion)$(SEP)bin,$(X11_PATH))
X11_PATH := $(X11_PATH:%$(SEP)bin=%)
ifdef xversion
X11_PATH := $(subst ;, ,$(PATH)) $(subst :, ,$(PATH))
X11_PATH := $(filter %$(xversion)$(SEP)bin,$(X11_PATH))
X11_PATH := $(X11_PATH:%$(SEP)bin=%)
endif
endif
##########################################################################