diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-01-26 13:52:40 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-01-26 13:52:40 -0400 |
| commit | e72de399c753c17ac0f024bee78842092f8598d1 (patch) | |
| tree | 297e98641b12fb36c4e71677d4e1c528f213ba3d | |
| parent | 1c21a0c6c994f8348c7c2dd0e635fd350a3bb5fa (diff) | |
| download | fork-ledger-e72de399c753c17ac0f024bee78842092f8598d1.tar.gz fork-ledger-e72de399c753c17ac0f024bee78842092f8598d1.tar.bz2 fork-ledger-e72de399c753c17ac0f024bee78842092f8598d1.zip | |
Fixed the way that python/setup.py was being invoked.
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index b92a9593..d8de8e37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -260,14 +260,15 @@ clean-local: if HAVE_GDTOA install-exec-hook: - CFLAGS="$(CPPFLAGS)" \ + CFLAGS="$(CPPFLAGS)" ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \ LDFLAGS="$(LDFLAGS) -L. -L.libs -Llib/gdtoa -Llib/gdtoa/.libs" \ - $(PYTHON) python/setup.py install \ + $(PYTHON) $(srcdir)/python/setup.py install \ --prefix=$(prefix) --root=$(DESTDIR)/ else install-exec-hook: - CFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) -L. -L.libs" \ - $(PYTHON) python/setup.py install \ + CFLAGS="$(CPPFLAGS)" ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \ + LDFLAGS="$(LDFLAGS) -L. -L.libs" \ + $(PYTHON) $(srcdir)/python/setup.py install \ --prefix=$(prefix) --root=$(DESTDIR)/ endif @@ -299,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) python/setup.py build \ + $(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) @@ -308,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) python/setup.py build \ + $(PYTHON) $(srcdir)/python/setup.py build \ --build-lib=$$BUILD_DIR/ --build-temp=$$BUILD_DIR/build -f) endif |