[Kde-imaging] libkipi 0.1: srcdir != builddir bug outside keg-libs-1

[Achim Bohnet]

Hi,

building libkipi in a (minimal) pbuilder chroot environment 
without libkipi installed breaks with:

/bin/sh ../libtool --silent --mode=compile --tag=CXX g++ -DHAVE_CONFIG_H -I. -I/tmp/buildd/libkipi-0.1/./libkipi -I.. -I/tmp/buildd/libkipi-0.1/./libkipi -I/usr/include/kde -I/usr/share/qt3/include -I.   -DQT_THREAD_SUPPORT  -D_REENTRANT  -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -g -Wall -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION  -c -o interface.lo `test -f '/tmp/buildd/libkipi-0.1/./libkipi/interface.cpp' || echo '/tmp/buildd/libkipi-0.1/./libkipi/'`/tmp/buildd/libkipi-0.1/./libkipi/interface.cpp
In file included from /tmp/buildd/libkipi-0.1/libkipi/interface.cpp:30:
/tmp/buildd/libkipi-0.1/libkipi/pluginloader.h:25:31: libkipi/interface.h: No such file or directory
In file included from /tmp/buildd/libkipi-0.1/libkipi/interface.cpp:31:
/tmp/buildd/libkipi-0.1/libkipi/interface.h:37:37: libkipi/imagecollection.h: No such file or directory
/tmp/buildd/libkipi-0.1/libkipi/interface.h:38:31: libkipi/imageinfo.h: No such file or directory
In file included from /tmp/buildd/libkipi-0.1/libkipi/interface.cpp:31:

I never found this before because cvsExtract (?) seem to strip one libkipi
level from the keg-libs-1 layout, but cvs2dist I used earlier does not :(

 keg-libs-1/libkipi/libkipi/interface.h
but
 libkipi-0.1/libkipi/interface.h

My hack below supports both layouts:

--- libkipi-0.1.orig/libkipi/Makefile.am
+++ libkipi-0.1/libkipi/Makefile.am
@@ -1,5 +1,5 @@
 METASOURCES = AUTO
-INCLUDES=  -I$(top_srcdir)/libkipi $(all_includes)
+INCLUDES=  -I$(srcdir)/.. $(all_includes)

 KDE_ICON = kipi


don't know it there's a more elegant solution that '..' usage
(beside using cvs2dist ;).

Achim
-- 
  To me vi is Zen.  To use vi is to practice zen. Every command is
  a koan. Profound to the user, unintelligible to the uninitiated.
  You discover truth everytime you use it.
                                      -- reddy at lion.austin.ibm.com