Changeset 1584


Ignore:
Timestamp:
Oct 22, 2009 12:26:17 AM (15 years ago)
Author:
gah
Message:

remove use of python.env file

Location:
trunk/lang/python
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/lang/python/Makefile.in

    r1426 r1584  
    2424               --include-dirs=$(srcdir)/../../src/core:$(includedir)
    2525PYTHON_VERSION  = @PYTHON_VERSION@
    26 pythonlib       = $$destdir/lib/python$(PYTHON_VERSION)/site-packages
     26pythonlib       = $(libdir)/python$(PYTHON_VERSION)/site-packages
    2727envfile         = python.env
    2828
    … …  
    3333# into a temporary directory.
    3434#
    35 all: build/tmp $(envfile)
     35all: build/tmp
    3636        $(PYTHON) setup.py build_ext $(PYTHON_FLAGS) build
    3737
    … …  
    4141 
    4242install:
    43         $(PYTHON) setup.py install --prefix=$(prefix)
    44         $(MKDIR_P) $(bindir)
    45         $(INSTALL) -m 555 $(envfile) $(bindir)
     43        $(MKDIR_P) $(pythonlib)
     44        $(PYTHON) setup.py install --install-lib=$(pythonlib)
    4645clean:
    4746        $(PYTHON) setup.py clean
    4847        $(RM) -rf build
    4948
    50 $(envfile):
    51         echo 'export PYTHONPATH=$(pythonlib):$$PYTHONPATH' > $(envfile)
    52 
    5349distclean: clean

  • trunk/lang/python/setup.py.in

    r1100 r1584  
    1111                           sources = [ tmpdir+'PyRpLibrary.cc' ],
    1212                           library_dirs = [ libdir, '../src' ],
    13                            output_dir = ['/tmp'],
    1413                           libraries = [ 'rappture' ] )
    1514
Note: See TracChangeset for help on using the changeset viewer.