diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-01-26 14:13:10 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-01-26 14:13:10 -0400 |
| commit | 082614a0869cde22d94fce525c5639f5e2f49700 (patch) | |
| tree | facf43a793ffeb4d5929f19379e10ef7a707acf5 | |
| parent | e72de399c753c17ac0f024bee78842092f8598d1 (diff) | |
| download | ledger-082614a0869cde22d94fce525c5639f5e2f49700.tar.gz ledger-082614a0869cde22d94fce525c5639f5e2f49700.tar.bz2 ledger-082614a0869cde22d94fce525c5639f5e2f49700.zip | |
Pass $(srcdir) down to python/setup.py, so it can find pyledger.cc.
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rwxr-xr-x | python/setup.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index d8de8e37..842261f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/python/setup.py b/python/setup.py index 26e74cf0..e040f51d 100755 --- a/python/setup.py +++ b/python/setup.py @@ -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)]) |