Changeset 1002

Timestamp:

01/07/08 16:47:30 (4 years ago)

Author:

Freddie Akeroyd

Message:

• Fix for automake-1.10
• nxs.py is now editied during the install process to contain the correct path to the NeXus library

Refs #101

Location:

trunk

Files:

• autogen.sh (modified) (1 diff)
• autoversion.sh (modified) (1 diff)
• bindings/python/Makefile.am (modified) (1 diff)
• bindings/python/nxs.py (modified) (2 diffs)

trunk/autogen.sh

@@ -42 +42 @@
 
 case $automakeversion in
-    *1.[4-9]*)
+    *1.[4-9].*)
+        ;;
+    *1.1[0-9].*)
         ;;
     *)

trunk/autoversion.sh

@@ -1 +1 @@
 #!/bin/sh
 
-for automake in automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5 automake-1.4 automake ; do
+for automake in automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5 automake-1.4 automake ; do
         AUTOMAKE=`which $automake 2>/dev/null |  grep -v '^no'`
         if test "$AUTOMAKE" ; then

trunk/bindings/python/Makefile.am

@@ -31 +31 @@
 pydocdir        = $(NXDOCDIR)/python
 pydoc_DATA      = README.html
-python_PYTHON = nxs.py setup.py nxstest.py
+pkgpython_PYTHON = nxs.py setup.py nxstest.py
 EXTRA_DIST      = README.html
 
-#install-data-hook :
-#       python setup.py install --root=$(DESTDIR)
+install-data-hook :
+        sed -e "s|nxprefix = .*|nxprefix = \'${prefix}\'|" < ${srcdir}/nxs.py > $(DESTDIR)${pkgpythondir}/nxs.py
+
+# python setup.py install --root=$(DESTDIR)
 
 include $(top_srcdir)/build_rules.am

trunk/bindings/python/nxs.py

@@ -185 +185 @@
     Load the NeXus library whereever it may be.
     """
+    # this will get changed as part of the install process
+    # it should correspond to --prefix specified to ./configure
+    nxprefix = '/usr/local'
     # NEXUSLIB takes precedence
     if 'NEXUSLIB' in os.environ:
@@ -210 +213 @@
         # Search the load library path as well as the standard locations
         ldpath = [p for p in os.environ.get(ldenv,'').split(':') if p != '']
-        stdpath = ['/usr/local/lib','/usr/lib']
+        stdpath = [ nxprefix+'/lib', '/usr/local/lib', '/usr/lib']
         files += [os.path.join(p,lib) for p in [filedir]+ldpath+stdpath]