Make use of python2.6 when regular executable is not good enough
Monotone-Parent: 5482c2b5518f1f90b17ae8222dc1fa7c48830345 Monotone-Revision: cacefec02204aa8b679c093b97728a347f35d630 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-07-25T20:25:01 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
2298067c97
commit
15f1b39979
|
@ -26,7 +26,16 @@ BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
|
|||
|
||||
UNRTF_DIR = unrtf-$(UNRTF_VERSION)
|
||||
|
||||
SAMBA_PRIVATE_DIR = $(shell ./samba-get-config.py "private dir")
|
||||
PYTHON = /usr/bin/python
|
||||
PYTHON_IS_GOOD = $(shell $(PYTHON) -c 'from sys import version_info; a=version_info; print a.major == 2 and a.minor >= 6')
|
||||
ifeq (${PYTHON_IS_GOOD},False)
|
||||
PYTHON = /usr/bin/python2.6
|
||||
endif
|
||||
|
||||
all::
|
||||
@echo " Python executable: ${PYTHON}"
|
||||
|
||||
SAMBA_PRIVATE_DIR = $(shell $(PYTHON) ./samba-get-config.py "private dir")
|
||||
|
||||
$(SOGOBACKEND)_SUBPROJECTS += $(UNRTF_DIR)/src
|
||||
|
||||
|
|
|
@ -2,4 +2,4 @@ all:: MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h
|
|||
|
||||
MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h: gen-property-selectors.py code-MAPIStorePropertySelectors.m code-MAPIStorePropertySelectors.h
|
||||
@echo " Auto-generating MAPIStorePropertySelectors.[hm]..."
|
||||
@./gen-property-selectors.py -o MAPIStorePropertySelectors $(LIBMAPISTORE_CFLAGS)
|
||||
@$(PYTHON) ./gen-property-selectors.py -o MAPIStorePropertySelectors $(LIBMAPISTORE_CFLAGS)
|
||||
|
|
Loading…
Reference in New Issue