[Bug 71625] New: Error in cvs.sh: incorrect location of kde.dot

[Frans Pop]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
     
http://bugs.kde.org/show_bug.cgi?id=71625     
           Summary: Error in cvs.sh: incorrect location of kde.dot
           Product: kdevelop
           Version: unspecified
          Platform: Debian stable
        OS/Version: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: NOR
         Component: general
        AssignedTo: kdevelop-devel at kdevelop.org
        ReportedBy: aragorn at tiscali.nl


Version:           3.0.0b2 (kdevelop-031231) (using KDE KDE 3.1.4)
Installed from:    Debian stable Packages
OS:          Linux

When kdelibs4-devis installed from current Debian stable backport, the file kde.dot is in /usr/include/kde/.
This is not correctly supported by the admin/cvs.sh script. Running 'make package-messages' results in:

$ make package-messages
make -f admin/Makefile.common package-messages
make[1]: Entering directory `/home/fjp/kdevelop/sigcreate'
./src
make[2]: Entering directory `/home/fjp/kdevelop/sigcreate/src'
error while opening "/usr/include/kde.pot" for reading: No such file or directory
make[2]: *** [messages] Error 1
...

I have traced this error to the following lines in cvs.sh (note: I added an extra line continuation):
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale \
-x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \
messages

To make the script work on my box I changed 3rd line to:
-x ${includedir:-${KDEDIR:-/usr/local/kde}/include/kde}/kde.pot" \

This solved the problem. However, this fix may break the script when kde is installed in /usr/local, so possibly another solution is necessary.