Changeset 1100 for trunk/lang/python

Timestamp:

Aug 6, 2008, 4:20:58 AM (16 years ago)

Author:

gah

Message:

assorted lang fixes

Location:

trunk/lang/python

Files:

• Makefile.in (modified) (2 diffs)
• setup.py.in (modified) (2 diffs)

trunk/lang/python/Makefile.in

@@ -23 +23 @@
 PYTHON_VERSION  = @PYTHON_VERSION@
 pythonlib       = $$RAPPTURE_INSTALL_DIR/lib/python$(PYTHON_VERSION)/site-packages
-envfile         = _python.env
+envfile         = python.env
 
 ARCHFLAGS       =
@@ -41 +41 @@
 install: 
         $(PYTHON) setup.py install --prefix=$(prefix) 
-        $(INSTALL) -m 555 $(envfile) $(bindir)
+        $(MKDIR_P) $(bindir)/lang
+        $(INSTALL) -m 555 $(envfile) $(bindir)/lang
 clean:
         $(PYTHON) setup.py clean

trunk/lang/python/setup.py.in

@@ -4 +4 @@
 tmpdir = 'build/tmp/'
 srcdir = '@srcdir@/Rappture/'
-incdir = '@prefix@/include'
-libdir = '@prefix@/lib'
+incdir = '@srcdir@/../../src/core'
+libdir = '@srcdir@/../../src/core'
 
 library_module = Extension('Rappture.library',
@@ -11 +11 @@
                            sources = [ tmpdir+'PyRpLibrary.cc' ],
                            library_dirs = [ libdir, '../src' ],
+                           output_dir = ['/tmp'],
                            libraries = [ 'rappture' ] )