[Pkg-kde-commits] rev 796 - branches/kde-3.4.0/common-patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-13 16:41:07 +0100 (Sun, 13 Mar 2005)
New Revision: 796

Added:
   branches/kde-3.4.0/common-patches/08_kdepotpath.diff
Log:
Allow targets to find kde.pot, even if it's
not in KDEDIR/include/kde.pot.

This is dato's patch, applied to HEAD.


Added: branches/kde-3.4.0/common-patches/08_kdepotpath.diff
===================================================================
--- branches/kde-3.4.0/common-patches/08_kdepotpath.diff	2005-03-13 06:38:09 UTC (rev 795)
+++ branches/kde-3.4.0/common-patches/08_kdepotpath.diff	2005-03-13 15:41:07 UTC (rev 796)
@@ -0,0 +1,11 @@
+--- a/admin/cvs.sh
++++ b/admin/cvs.sh
+@@ -561,7 +561,7 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+
+-   kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
++   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages