Changeset 6752
- Timestamp:
- 05/10/12 12:22:10 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Maketype
r6751 r6752 10 10 endif 11 11 12 CONF_DIR = /usr/local/etc 13 12 14 LIB_PTHREAD = -lpthread 13 15 LIB_MATH = -lm … … 15 17 override STD_LIBS := $(LIB_PTHREAD) $(LIB_MATH) 16 18 override STD_DEFS := -D'CS_SVN_VERSION="$(SVN_REV)"' 19 20 # The following is workaround until Makefile is fixed not to 21 # set -DCS_CONFDIR=/blah in DS_OPTS variable. Basically it 22 # sets CONF_DIR from in DS_OPTS and removes -DCS_CONFDIR=blah 23 # from DS_OTS to avoid warnings about CS_CONFDIR being redefined. 24 ifeq "$(findstring -DCS_CONFDIR,$(DS_OPTS))" "-DCS_CONFDIR" 25 override CONF_DIR:= $(subst ",,$(subst ',,$(subst -DCS_CONFDIR=,,$(filter -DCS_CONFDIR=%,$(DS_OPTS))))) 26 override DS_OPTS := $(filter-out -DCS_CONFDIR%,$(DS_OPTS)) 27 endif 28 override STD_DEFS += -D'CS_CONFDIR="$(CONF_DIR)"' 17 29 18 30 # Compiler warnings … … 205 217 | RANLIB = $(RANLIB)\n\ 206 218 | Settings:\n\ 219 | CONF_DIR = $(CONF_DIR)\n\ 207 220 | CC_OPTS = $(CC_OPTS)\n\ 208 221 | CC_WARN = $(CC_WARN)\n\
Note:
See TracChangeset
for help on using the changeset viewer.