[cig-commits] r5403 - mc/3D/CitcomS/trunk

[leif at geodynamics.org]

Author: leif
Date: 2006-11-30 20:40:37 -0800 (Thu, 30 Nov 2006)
New Revision: 5403

Modified:
   mc/3D/CitcomS/trunk/Makefile.am
   mc/3D/CitcomS/trunk/configure.ac
Log:
The "make install" command now works again.


Modified: mc/3D/CitcomS/trunk/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/Makefile.am	2006-12-01 00:37:41 UTC (rev 5402)
+++ mc/3D/CitcomS/trunk/Makefile.am	2006-12-01 04:40:37 UTC (rev 5403)
@@ -33,4 +33,9 @@
 SUBDIRS = lib $(MAYBE_PYRE) bin
 
 
+install-data-hook:
+	$(PYTHON) $(top_srcdir)/setup.py install_deps -H None -f $(top_builddir)/deps --prefix=$(prefix)
+	$(PYTHON) $(top_srcdir)/setup.py egg_info -e $(pythondir)
+
+
 ## end of Makefile.am

Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2006-12-01 00:37:41 UTC (rev 5402)
+++ mc/3D/CitcomS/trunk/configure.ac	2006-12-01 04:40:37 UTC (rev 5403)
@@ -59,11 +59,16 @@
     save_PYTHONPATH="$PYTHONPATH"
     PYTHONPATH="`pwd`:$PYTHONPATH"; export PYTHONPATH
 
-    AC_MSG_NOTICE([checking/downloading Python dependencies])
-    AS_IF([AC_TRY_COMMAND([$PYTHON $srcdir/setup.py install_deps -x -d . >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
+    AC_MSG_NOTICE([downloading missing Python dependencies])
+    AS_IF([AC_TRY_COMMAND([$PYTHON $srcdir/setup.py install_deps -zmaxd deps >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
           [],
-          [AC_MSG_FAILURE([cannot check/download Python dependencies])])
+          [AC_MSG_FAILURE([cannot download missing Python dependencies])])
 
+    AC_MSG_NOTICE([building Python dependencies])
+    AS_IF([AC_TRY_COMMAND([$PYTHON $srcdir/setup.py install_deps -H None -f deps -x -d . >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
+          [],
+          [AC_MSG_FAILURE([building Python dependencies])])
+
     AC_MSG_CHECKING([for egg-related flags])
     AS_IF([AC_TRY_COMMAND([$PYTHON $srcdir/setup.py egg_flags >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
           [AC_MSG_RESULT(ok)
@@ -74,7 +79,9 @@
           AC_MSG_FAILURE([cannot scan Python eggs for flags])])
 
     PYTHONPATH="$save_PYTHONPATH"
+    PYTHONPATH="${pythondir}:${pyexecdir}${save_PYTHONPATH:+:${save_PYTHONPATH}}"
 
+    AC_SUBST(PYTHONPATH)
     AC_SUBST(PYTHON_EGG_CFLAGS)
     AC_SUBST(PYTHON_EGG_CPPFLAGS)
     AC_SUBST(PYTHON_EGG_LDFLAGS)