Hi Rocky,

> If you create patch against the current libcdio sources
> https://savannah.gnu.org/git/?group=libcdio I will add that to the
> source.

Just looked at this. So:

a) The find […] -delete call is Debian-specific AFAICT, unless you
think otherwise?

b) The actual source/buldpath issue can be fixed better by simply
dropping the entire calculation of `pwd` altogether; it wasn't even
being used in the Doxygen config as FULL_PATH_NAMES is set to NO.

I've attached a patch that demonstrates what I mean, but please do
test it :)


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-
From 08c1768aaeea86c522c0ef1705b9b6d434ebd3ae Mon Sep 17 00:00:00 2001
From: Chris Lamb <ch...@chris-lamb.co.uk>
Date: Fri, 28 Jul 2017 11:49:13 +0100
Subject: [PATCH] Drop LIBCDIO_SOURCE_PATH by dropping STRIP_FROM_PATH Doxygen
 setup; it's not used as FULL_PATH_NAMES = no

---
 configure.ac            | 5 -----
 doc/doxygen/Doxyfile.in | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30fa678e..ac1bdd50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -552,11 +552,6 @@ AC_SUBST(HAVE_SOLARIS_CDROM)
 AC_SUBST(HAVE_WIN32_CDROM)
 AC_SUBST(HAVE_OS2_CDROM)
 
-LIBCDIO_SOURCE_PATH="`pwd`"
-AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH",
-	[Full path to libcdio top_sourcedir.])
-AC_SUBST(LIBCDIO_SOURCE_PATH)
-
 AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \
 		 getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \
 		 seteuid setegid snprintf setenv strndup unsetenv tzset sleep \
diff --git a/doc/doxygen/Doxyfile.in b/doc/doxygen/Doxyfile.in
index a16b99e0..53ff08da 100644
--- a/doc/doxygen/Doxyfile.in
+++ b/doc/doxygen/Doxyfile.in
@@ -138,7 +138,7 @@ FULL_PATH_NAMES        = NO
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH        = @LIBCDIO_SOURCE_PATH@
+STRIP_FROM_PATH        =
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
-- 
2.13.3

Reply via email to