[Rivet-svn] r4247 - trunk/pyext

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Apr  9 15:59:37 2013
New Revision: 4247

Log:
Tweaks to Cython build

Modified:
   trunk/pyext/Makefile.am
   trunk/pyext/setup.py.in

Modified: trunk/pyext/Makefile.am
==============================================================================
--- trunk/pyext/Makefile.am	Fri Apr  5 10:46:05 2013	(r4246)
+++ trunk/pyext/Makefile.am	Tue Apr  9 15:59:37 2013	(r4247)
@@ -3,10 +3,10 @@
 SUBDIRS = rivet .
 
 all-local: rivet/rivetwrap_wrap.cc
-	$(PYTHON) setup.py build
+	$(ENV) $(PYTHON) setup.py build
 
 install-exec-local:
-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+	$(ENV) $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
 
 ## TODO: Really want DESTDIR here?
 uninstall-local:
@@ -14,7 +14,7 @@
 	rm -rf $(DESTDIR)$(RIVET_PYTHONPATH)/Rivet-*.egg-info
 
 clean-local:
-	$(PYTHON) setup.py clean --all
+	$(ENV) $(PYTHON) setup.py clean --all
 	@rm -f $(top_builddir)/*.pyc
 	@rm -rf $(builddir)/build
 	@rm -rf dist

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Fri Apr  5 10:46:05 2013	(r4246)
+++ trunk/pyext/setup.py.in	Tue Apr  9 15:59:37 2013	(r4247)
@@ -19,7 +19,7 @@
 
 ext = Extension('_rivetwrap', [wrapsrc],
                 include_dirs=[incdir_src, incdir_build, '@HEPMCINCPATH@', '@GSLINCPATH@'],
-                extra_compile_args= "-I at prefix@/include @BOOST_CPPFLAGS@ @CXXFLAGS@".split(),
+                extra_compile_args= "-I at prefix@/include @BOOST_CPPFLAGS@ @AM_CPPFLAGS @CPPFLAGS@ @AM_CXXFLAGS @CXXFLAGS@".split(),
                 library_dirs=[libdir, libdir_yaml, '@HEPMCLIBPATH@'],
                 extra_link_args = "-L at prefix@/lib @LDFLAGS@".split(),
                 libraries=['Rivet']) # 'HepMC', 'fastjet', 'yaml-cpp', 'GSL', 'HepPID'