diff options
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | pot/Makefile.am | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d091ca8..2149d24 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1794,8 +1794,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" -test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -2031,7 +2031,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ diff --git a/pot/Makefile.am b/pot/Makefile.am index d35f330..585b1fa 100644 --- a/pot/Makefile.am +++ b/pot/Makefile.am @@ -19,10 +19,10 @@ messages: echo Now extract the messages... perl ./extractrc ../bibletime/xml/*.rc > ../bibletime/rc-dummy.cpp perl ./preparetips ../docs/tips > ../bibletime/tips-dummy.cpp - $(XGETTEXT) -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/kde/kde.pot `find .. -type f -not -name clanguagemgr.cpp -and -name \*.cpp -or -name \*.h -or -name \*.cc` -o messages.pot + $(XGETTEXT) -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/tde/kde.pot `find .. -type f -not -name clanguagemgr.cpp -and -name \*.cpp -or -name \*.h -or -name \*.cc` -o messages.pot recode iso8859-1..utf-8 messages.pot cp ../bibletime/backend/clanguagemgr.cpp clanguagemgr.cpp - $(XGETTEXT) --from-code=utf-8 --join-existing -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/kde/kde.pot clanguagemgr.cpp -o messages.pot + $(XGETTEXT) --from-code=utf-8 --join-existing -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/tde/kde.pot clanguagemgr.cpp -o messages.pot rm clanguagemgr.cpp echo Finished creating messages.pot. |