diff options
author | François Andriot <albator78@libertysurf.fr> | 2014-10-01 20:01:06 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2014-10-01 20:01:06 +0200 |
commit | cd987458557f4163072c33effd4df34e7e8a4288 (patch) | |
tree | 90cf7aecf9dfd20f03572e6d81f38c3a9cc36120 /ubuntu/maverick/tdewebdev/debian/patches/common | |
parent | fc5d3c8d01e679b569e18b13488363cadb5e1d7f (diff) | |
parent | 4ed48b596a3124deac51b66df656c57f9f88c4d9 (diff) | |
download | tde-packaging-cd987458557f4163072c33effd4df34e7e8a4288.tar.gz tde-packaging-cd987458557f4163072c33effd4df34e7e8a4288.zip |
merge
Diffstat (limited to 'ubuntu/maverick/tdewebdev/debian/patches/common')
-rw-r--r-- | ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 47aee4140..28c95742b 100644 --- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/tde/kde.pot ++kdepotpath=/usr/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ 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:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ |