[Debian-astro-commits] [gyoto] 173/221: Install enough material to build python extensions around 3rd party Gyoto plugins

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 78b9c99ea2c79f54a3bd045c2d9c77845ba7a959
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Mon Jan 5 09:56:46 2015 +0100

    Install enough material to build python extensions around 3rd party Gyoto plugins
---
 lib/gyoto-uninstalled.pc.in |  8 +++++---
 lib/gyoto.pc.in             |  2 ++
 python/Makefile.in          | 23 +++++++++++++++--------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/gyoto-uninstalled.pc.in b/lib/gyoto-uninstalled.pc.in
index 715d6dd..bb9314c 100644
--- a/lib/gyoto-uninstalled.pc.in
+++ b/lib/gyoto-uninstalled.pc.in
@@ -8,9 +8,11 @@ GYOTO=${abs_top_srcdir}/bin/gyoto
 
 GYOTO_PLUGDIR=${exec_prefix}/lib/gyoto/@sovers@
 
-YORICK=
-Y_INST_HOME=
-Y_INST_SITE=
+YORICK=@YORICK@
+Y_INST_HOME=@Y_INST_HOME@
+Y_INST_SITE=@Y_INST_SITE@
+
+PYTHON=@PYTHON@
 
 HOME_LORENE=@HOME_LORENE@
 LORENECPPFLAGS=@LORENECPPFLAGS@
diff --git a/lib/gyoto.pc.in b/lib/gyoto.pc.in
index 096f389..1f2d2b3 100644
--- a/lib/gyoto.pc.in
+++ b/lib/gyoto.pc.in
@@ -11,6 +11,8 @@ YORICK=@YORICK@
 Y_INST_HOME=@Y_INST_HOME@
 Y_INST_SITE=@Y_INST_SITE@
 
+PYTHON=@PYTHON@
+
 HOME_LORENE=@HOME_LORENE@
 LORENECPPFLAGS=@LORENECPPFLAGS@
 LORENELDFLAGS=@LORENELDFLAGS@
diff --git a/python/Makefile.in b/python/Makefile.in
index 1f69874..30e2f70 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -84,8 +84,10 @@ export CC
 GYOTO_EXTENSIONS =  _gyoto$(PYTHON_EXTENSION_SUFFIX) \
                     _gyoto_std$(PYTHON_EXTENSION_SUFFIX)
 GYOTO_PYFILES = gyoto.py gyoto_std.py
+GYOTO_SWIGFILES = gyoto.i gyoto_std.i
 @HAVE_LORENE_TRUE at GYOTO_EXTENSIONS += _gyoto_lorene$(PYTHON_EXTENSION_SUFFIX)
 @HAVE_LORENE_TRUE at GYOTO_PYFILES += gyoto_lorene.py
+ at HAVE_LORENE_TRUE@GYOTO_SWIGFILES += gyoto_lorene.i
 
 all: $(GYOTO_PYFILES) $(GYOTO_EXTENSIONS)
 
@@ -117,15 +119,17 @@ gyoto_lorene.py gyoto_lorene_wrap.cxx: gyoto_std.i gyoto.i
 # variable is set to anything other than "no", set up a new virtualenv and install there, otherwise
 # install as usual from setup.py
 install: installdirs
-	$(PYTHON) $(srcdir)/setup.py install
-	$(PYTHON) $(srcdir)/setup_std.py install
- at HAVE_LORENE_TRUE@	$(PYTHON) $(srcdir)/setup_lorene.py install
 ifneq ($(VIRTUALENV),no)
 	$(VIRTUALENV) $(VIRTUALENV_FLAGS) $(DESTDIR)$(prefix) || $(VIRTUALENV) $(DESTDIR)$(prefix)
 	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
+	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup_std.py install --prefix=$(DESTDIR)$(prefix)
+ at HAVE_LORENE_TRUE@	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup_lorene.py install --prefix=$(DESTDIR)$(prefix)
 else
 	$(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
+	$(PYTHON) $(srcdir)/setup_std.py install --prefix=$(DESTDIR)$(prefix)
+ at HAVE_LORENE_TRUE@	$(PYTHON) $(srcdir)/setup_lorene.py install --prefix=$(DESTDIR)$(prefix)
 endif
+	$(INSTALL_DATA) $(GYOTO_SWIGFILES) numpy.i $(DESTDIR)$(pkgincludedir)
 
 
 # setup.py doesn't (yet) support an uninstall command, so until it does, you 
@@ -134,11 +138,12 @@ endif
 # triple-check it so that you don't remove something you shouldn't!
 # Be sure to remove any extra files you install, such as binaries or documentation!
 uninstall: 
-	-rm -rvf $(pkgpythondir)
-	-rm -v $(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info
-	-rm $(pythondir)/_gyoto$(PYTHON_EXTENSION_SUFFIX)
-	-rm $(pythondir)/gyoto.py
-	-rm $(pythondir)/gyoto.pyc
+	-cd $(DESTDIR)$(pkgincludedir) ; rm $(GYOTO_SWIGFILES) numpy.i
+	-rm -rvf $(DESTDIR)$(pkgpythondir)
+	-rm -v $(DESTDIR)$(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info
+	-rm $(DESTDIR)$(pythondir)/_gyoto$(PYTHON_EXTENSION_SUFFIX)
+	-rm $(DESTDIR)$(pythondir)/gyoto.py
+	-rm $(DESTDIR)$(pythondir)/gyoto.pyc
 
 
 # Just use the usual setup.py clean command
@@ -168,6 +173,8 @@ check:
 # here
 installdirs:
 	$(MKDIR_P) $(DESTDIR)$(pkgpythondir)
+	$(MKDIR_P) $(DESTDIR)$(pkgincludedir)
+
 
 
 # The following show how to install documentation. In this example,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git