[Debian-astro-commits] [gyoto] 01/03: * clean leftover files from doxygen * use pkglibdir instead of asuming it is prefix/lib/yorick
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Sat May 23 11:45:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit 752026d3bc4d4bd5c4fdf3e74c2e6c6d8170d887
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Sat May 23 09:31:29 2015 +0200
* clean leftover files from doxygen
* use pkglibdir instead of asuming it is prefix/lib/yorick
---
doc/Makefile.in | 2 +-
include/GyotoConfig.h.in | 9 +++++++++
include/GyotoRegister.h | 4 ++--
lib/Makefile.am | 2 +-
lib/Makefile.in | 2 +-
lib/Register.C | 3 +--
lib/gyoto-uninstalled.pc.in | 12 ++++++------
lib/gyoto.pc.in | 9 +++++----
python/Makefile.in | 1 +
9 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index cb766ef..86618a0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -13,7 +13,7 @@ latex.stamp:
distclean clean:
-rm doxygen.stamp latex.stamp
- -rm -fr html xml latex
+ -rm -fr html xml latex doxygen_sqlite3.db
@MKGUIDE_TRUE@ cd user_guide; $(MAKE) clean
%: ;
diff --git a/include/GyotoConfig.h.in b/include/GyotoConfig.h.in
index eaa15ba..f953d88 100644
--- a/include/GyotoConfig.h.in
+++ b/include/GyotoConfig.h.in
@@ -60,6 +60,15 @@
# endif
#endif
+/** \def GYOTO_PKGLIBDIR
+ \brief Gyoto pkglibdir, usually GYOTO_PREFIX/lib/gyoto */
+#undef GYOTO_PKGLIBDIR
+#ifdef DOXYGEN_RUN
+# ifndef GYOTO_PKGLIBDIR
+# define GYOTO_PKGLIBDIR (undefined)
+# endif
+#endif
+
/** \def GYOTO_SOVERS
\brief Gyoto ABI version.
diff --git a/include/GyotoRegister.h b/include/GyotoRegister.h
index b58d944..792de21 100644
--- a/include/GyotoRegister.h
+++ b/include/GyotoRegister.h
@@ -72,8 +72,8 @@ namespace Gyoto {
* Uses dlopen to load the file libgyoto-<plugname>.so, looks for
* the function __Gyoto<plugname>Init inside it and run it.
* Plug-ins must be located in the runtime link search path, or in
- * GYOTO_PREFIX/lib/gyoto/, or in
- * GYOTO_PREFIX/lib/gyoto/GYOTO_SOVERS/.
+ * GYOTO_PKGLIBDIR, or in
+ * GYOTO_PKGLIBDIR/GYOTO_SOVERS/.
*
* \param plugname Plug-in name.
* \param nofail Unless nofail evals to true, the inability to find
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f909659..093721d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I at top_srcdir@/include $(XERCESCPPFLAGS) $(UDUNITS_CPPFLAGS) $(BOOST_CPPFLAGS)
AM_LDFLAGS = $(XERCESLDFLAGS) -export-dynamic $(PTHREAD_LIBS) \
$(UDUNITS_LDFLAGS)
-AM_CXXFLAGS = $(PTHREAD_CFLAGS) -DGYOTO_PREFIX=\"${prefix}\"
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) -DGYOTO_PKGLIBDIR=\"${pkglibdir}\"
if HAVE_MPI
AM_LDFLAGS += $(BOOST_MPI_LDFLAGS) -lboost_mpi \
$(BOOST_SERIALIZATION_LDFLAGS) -lboost_serialization
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 75a6a45..d2fd711 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -442,7 +442,7 @@ ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I at top_srcdir@/include $(XERCESCPPFLAGS) $(UDUNITS_CPPFLAGS) $(BOOST_CPPFLAGS)
AM_LDFLAGS = $(XERCESLDFLAGS) -export-dynamic $(PTHREAD_LIBS) \
$(UDUNITS_LDFLAGS) $(am__append_1)
-AM_CXXFLAGS = $(PTHREAD_CFLAGS) -DGYOTO_PREFIX=\"${prefix}\"
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) -DGYOTO_PKGLIBDIR=\"${pkglibdir}\"
# HEADERS: where they are, where to install them
library_includedir = $(includedir)/Gyoto
diff --git a/lib/Register.C b/lib/Register.C
index 6184c0f..24c3e83 100644
--- a/lib/Register.C
+++ b/lib/Register.C
@@ -50,8 +50,7 @@ void Gyoto::loadPlugin(char const*const name, int nofail) {
<< " from file: " << dlfile << endl;
handle = dlopen(dlfile.c_str(), RTLD_LAZY | RTLD_GLOBAL);
if (!handle) {
- string dlpath = GYOTO_PREFIX ;
- dlpath += "/lib/gyoto/" ;
+ string dlpath = GYOTO_PKGLIBDIR "/";
string dlfull = dlpath + dlfile;
handle = dlopen(dlfull.c_str(), RTLD_LAZY | RTLD_GLOBAL);
if (!handle) {
diff --git a/lib/gyoto-uninstalled.pc.in b/lib/gyoto-uninstalled.pc.in
index 8cebc4d..7348d70 100644
--- a/lib/gyoto-uninstalled.pc.in
+++ b/lib/gyoto-uninstalled.pc.in
@@ -1,12 +1,12 @@
prefix=@prefix@
-exec_prefix=${prefix}
-abs_top_srcdir=@abs_top_srcdir@
-libdir=${abs_top_srcdir}/lib/.libs
-includedir=${abs_top_srcdir}/include
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pkglibdir=${libdir}/@PACKAGE@
-GYOTO=${abs_top_srcdir}/bin/gyoto
+GYOTO=${exec_prefix}/bin/gyoto
-GYOTO_PLUGDIR=${exec_prefix}/lib/gyoto/@sovers@
+GYOTO_PLUGDIR=${pkglibdir}/@sovers@
YORICK=@YORICK@
Y_INST_HOME=@Y_INST_HOME@
diff --git a/lib/gyoto.pc.in b/lib/gyoto.pc.in
index e32bbd9..d58ee06 100644
--- a/lib/gyoto.pc.in
+++ b/lib/gyoto.pc.in
@@ -1,11 +1,12 @@
prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pkglibdir=${libdir}/@PACKAGE@
GYOTO=${exec_prefix}/bin/gyoto
-GYOTO_PLUGDIR=${libdir}/gyoto/@sovers@
+GYOTO_PLUGDIR=${pkglibdir}/@sovers@
YORICK=@YORICK@
Y_INST_HOME=@Y_INST_HOME@
diff --git a/python/Makefile.in b/python/Makefile.in
index 1d41aaf..fe96382 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -180,6 +180,7 @@ clean:
@HAVE_LORENE_TRUE@ $(PYTHON) setup_lorene.py clean
-rm -Rf build
-rm gyoto*.py gyoto*_wrap.cxx *.pyc gyoto_doc.i gyoto_doc.i.orig
+ -rm doxygen_sqlite3.db
# Clean up the output of configure
distclean: clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list