Changeset 8943:283d745f32b2 in orange


Ignore:
Timestamp:
09/10/11 01:28:18 (3 years ago)
Author:
mitar
Branch:
default
Convert:
bf663390f16cc9c512e712adbe13f7d832a1cb90
Message:

Fixing python variable in makefiles.

Location:
source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • source/Makefile

    r8929 r8943  
    55  ORANGE_LIBDIR=../.. 
    66endif 
     7 
     8PYTHON ?= python 
    79 
    810MODULES=include orange orangeom orangene corn statc 
     
    1719$(ACTIONS): 
    1820    (for MODULE in $(MODULES) ; \ 
    19        do if ! $(MAKE) $@ -C $$MODULE OLD=$(ORANGE_LIBDIR); then exit 1; fi; done) 
     21       do if ! $(MAKE) $@ -C $$MODULE OLD=$(ORANGE_LIBDIR) PYTHON=$(PYTHON); then exit 1; fi; done) 
    2022ifndef EXCLUDE_ORANGEQT 
    21     if ! $(MAKE) $@ -C orangeqt OLD=$(ORANGE_LIBDIR) DESTDIR=$(DESTDIR); then exit 1; fi; 
     23    if ! $(MAKE) $@ -C orangeqt OLD=$(ORANGE_LIBDIR) PYTHON=$(PYTHON) DESTDIR=$(DESTDIR); then exit 1; fi; 
    2224endif    
    2325 
  • source/makefile.defs

    r8929 r8943  
    22# If this does not work, find Python.h yourself and enter 
    33# the directory below. 
    4 PYTHON ?= python 
    54PYTHONINCLUDE = $(shell $(PYTHON) -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]") 
    65PYTHONLIB = $(shell $(PYTHON) -c "import sys; print sys.prefix+'/lib/python'+sys.version[:3]") 
  • source/orangeqt/Makefile

    r8942 r8943  
    22ifndef OLD 
    33  OLD=.. 
     4endif 
     5ifndef PYTHON 
     6  PYTHON=python 
    47endif 
    58 
Note: See TracChangeset for help on using the changeset viewer.