Pass $(srcdir) down to python/setup.py, so it can find pyledger.cc.

This commit is contained in:
John Wiegley 2009-01-26 14:13:10 -04:00
parent e72de399c7
commit 082614a086
2 changed files with 5 additions and 5 deletions

View file

@ -262,13 +262,13 @@ if HAVE_GDTOA
install-exec-hook:
CFLAGS="$(CPPFLAGS)" ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \
LDFLAGS="$(LDFLAGS) -L. -L.libs -Llib/gdtoa -Llib/gdtoa/.libs" \
$(PYTHON) $(srcdir)/python/setup.py install \
SRCDIR="$(srcdir)" $(PYTHON) $(srcdir)/python/setup.py install \
--prefix=$(prefix) --root=$(DESTDIR)/
else
install-exec-hook:
CFLAGS="$(CPPFLAGS)" ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \
LDFLAGS="$(LDFLAGS) -L. -L.libs" \
$(PYTHON) $(srcdir)/python/setup.py install \
SRCDIR="$(srcdir)" $(PYTHON) $(srcdir)/python/setup.py install \
--prefix=$(prefix) --root=$(DESTDIR)/
endif
@ -300,7 +300,7 @@ ledger.so: $(ledger_so_SOURCES) $(ledger_so_DEPENDENCIES)
CFLAGS="$(CPPFLAGS) -I$(srcdir) -I$$BUILD_DIR -I$$BUILD_DIR/lib/gdtoa $(libledger_python_la_CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS) -L$$BUILD_DIR -L$$BUILD_DIR/.libs -L$$BUILD_DIR/lib/gdtoa -L$$BUILD_DIR/lib/gdtoa/.libs" \
ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \
$(PYTHON) $(srcdir)/python/setup.py build \
SRCDIR="$(srcdir)" $(PYTHON) $(srcdir)/python/setup.py build \
--build-lib=$$BUILD_DIR/ --build-temp=$$BUILD_DIR/build -f)
else
ledger.so: $(ledger_so_SOURCES) $(ledger_so_DEPENDENCIES)
@ -309,7 +309,7 @@ ledger.so: $(ledger_so_SOURCES) $(ledger_so_DEPENDENCIES)
CFLAGS="$(CPPFLAGS) -I$(srcdir) -I$$BUILD_DIR -I$$BUILD_DIR/lib/gdtoa $(libledger_python_la_CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS) -L$$BUILD_DIR -L$$BUILD_DIR/.libs" \
ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \
$(PYTHON) $(srcdir)/python/setup.py build \
SRCDIR="$(srcdir)" $(PYTHON) $(srcdir)/python/setup.py build \
--build-lib=$$BUILD_DIR/ --build-temp=$$BUILD_DIR/build -f)
endif

View file

@ -14,5 +14,5 @@ setup(name = "Ledger",
author_email = "johnw@newartisans.com",
url = "http://www.newartisans.com/software/ledger.html",
ext_modules = [
Extension("ledger", ['python/pyledger.cc'],
Extension("ledger", [os.environ["SRCDIR"] + '/python/pyledger.cc'],
define_macros = defines, libraries = libs)])