Author: leif
Date: 2006-12-05 16:42:34 -0800 (Tue, 05 Dec 2006)
New Revision: 5472
Modified:
mc/3D/CitcomS/trunk/Makefile.am
mc/3D/CitcomS/trunk/bin/Makefile.am
mc/3D/CitcomS/trunk/configure.ac
Log:
Fix for eggs not being installed by "make install" when
builddir == srcdir. This change also re-fixes the setup.py
infinite regress in a cleaner way.
Modified: mc/3D/CitcomS/trunk/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/Makefile.am 2006-12-06 00:18:47 UTC (rev 5471)
+++ mc/3D/CitcomS/trunk/Makefile.am 2006-12-06 00:42:34 UTC (rev 5472)
@@ -37,8 +37,10 @@
archimedes/__init__.py
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)
+ top_builddir=`$(am__cd) $(top_builddir) && pwd` && \
+ cd $(top_srcdir) && \
+ $(PYTHON) setup.py install_deps -H None -f $$top_builddir/deps --prefix=$(prefix) && \
+ $(PYTHON) setup.py egg_info -e $(pythondir)
## end of Makefile.am
Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am 2006-12-06 00:18:47 UTC (rev 5471)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am 2006-12-06 00:42:34 UTC (rev 5472)
@@ -65,12 +65,12 @@
if COND_EMBEDDING
INTERPRETER = $(bindir)/pycitcoms
noinstINTERPRETER = $(abs_builddir)/pycitcoms
- noinstPYTHONPATH = $(abs_top_builddir)
+ noinstPYTHONPATH = $(abs_top_builddir)/python
libCitcomS = $(top_builddir)/lib/libCitcomS.a
else
INTERPRETER = $(PYTHON)
noinstINTERPRETER = $(PYTHON)
- noinstPYTHONPATH = $(abs_top_builddir):$(abs_top_builddir)/module/.libs
+ noinstPYTHONPATH = $(abs_top_builddir)/python:$(abs_top_builddir)/module/.libs
libCitcomS = $(top_builddir)/lib/libCitcomS.la
endif
Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac 2006-12-06 00:18:47 UTC (rev 5471)
+++ mc/3D/CitcomS/trunk/configure.ac 2006-12-06 00:42:34 UTC (rev 5472)
@@ -58,7 +58,7 @@
builddir=`pwd`
save_PYTHONPATH="$PYTHONPATH"
- PYTHONPATH="$builddir:$PYTHONPATH"; export PYTHONPATH
+ PYTHONPATH="$builddir/python:$PYTHONPATH"; export PYTHONPATH
cd $srcdir
AC_MSG_NOTICE([downloading missing Python dependencies])
@@ -67,13 +67,10 @@
[AC_MSG_FAILURE([cannot download missing Python dependencies])])
AC_MSG_NOTICE([building Python dependencies])
- AS_IF([AC_TRY_COMMAND([$PYTHON setup.py develop -H None -f $builddir/deps -x -d $builddir >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
+ AS_IF([AC_TRY_COMMAND([$PYTHON setup.py develop -H None -f $builddir/deps -x -d $builddir/python >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
[],
[AC_MSG_FAILURE([building Python dependencies])])
- # When builddir == srcdir, this causes an infinite regress.
- rm -f CitcomS.egg-link
-
AC_MSG_CHECKING([for egg-related flags])
AS_IF([AC_TRY_COMMAND([$PYTHON setup.py egg_flags >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
[AC_MSG_RESULT(ok)