Changeset 1048


Ignore:
Timestamp:
Jun 13, 2008, 4:00:07 PM (16 years ago)
Author:
gah
Message:
 
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/aclocal.m4

    r1047 r1048  
    11builtin(include,./tcl.m4)
    2 builtin(include,./ac_python_devel.m4)

  • trunk/lang/Makefile.in

    r1047 r1048  
    1717PERL =          @PERL@
    1818TCLSH =         @TCLSH@
     19PYTHON_SITE_PACKAGES =  @PYTHON_SITE_PACKAGES@
    1920PYTHON =        @PYTHON@
    2021MEX =           @MEX@
    … …  
    3334  LANGS += target_perl
    3435endif
    35 ifneq ($(PYTHON),)
     36ifneq ($(PYTHON_SITE_PACKAGES),)
    3637  LANGS += target_python
    3738endif

  • trunk/lang/python/Makefile.in

    r1047 r1048  
    2020PYTHON_FLAGS = --library-dirs=$(libdir):../../src/core \
    2121               --include-dirs=$(srcdir)/../../src/core:$(includedir)
    22 PYTHON_SITE_PACKAGES =  @PYTHON_SITE_PACKAGES@
    2322
    2423#
    … …  
    2625# into a temporary directory.
    2726#
    28 ifneq($(PYTHON_SITE_PACKAGES),)
    29    MODULE_BUILD         = build_module
    30    MODULE_INSTALL       = install_module
    31    MODULE_CLEAN         = clean_module
    32 endif
    33 
    34 all: $(MODULE_BUILD)
    35 
    36 build_module: copy_sources
     27all: copy_sources
    3728        $(PYTHON) setup.py build_ext $(PYTHON_FLAGS) build
    3829
    39 copy_sources:
     30copy_sources:   
    4031        $(RM) -r build/tmp
    4132        $(INSTALL) -d build/tmp
    4233        $(INSTALL_DATA) $(srcdir)/Rappture/*.cc build/tmp
    4334 
    44 install: $(MODULE_INSTALL)
    45 
    46 install_module:
     35install:
    4736        $(PYTHON) setup.py install --prefix=$(prefix)
    4837
    49 clean: $(MODULE_CLEAN)
    50 
    51 clean_module:
     38clean:
    5239        $(PYTHON) setup.py clean
    5340        $(RM) -rf build
Note: See TracChangeset for help on using the changeset viewer.