diff options
| author | Darrell Anderson <[email protected]> | 2014-02-06 21:03:16 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2014-02-06 21:03:16 -0600 |
| commit | 653fef2be85acba2f095a9b00583f3e874539a48 (patch) | |
| tree | 09da3e9bd0be5a34cc0dbac56eb20074ce192fb1 | |
| parent | c8ecaac98e8f83ae14eef0c8473966bbecba4c55 (diff) | |
| parent | 5b0ce20a395169d2173bdd19687cef200ef165bf (diff) | |
| download | tdebase-653fef2be85acba2f095a9b00583f3e874539a48.tar.gz tdebase-653fef2be85acba2f095a9b00583f3e874539a48.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
| -rw-r--r-- | khelpcenter/searchhandlers/CMakeLists.txt | 22 | ||||
| -rw-r--r--[-rwxr-xr-x] | khelpcenter/searchhandlers/khc_htsearch.pl.in (renamed from khelpcenter/searchhandlers/khc_htsearch.pl) | 2 | ||||
| -rw-r--r-- | konsole/konsole/konsole.cpp | 2 |
3 files changed, 21 insertions, 5 deletions
diff --git a/khelpcenter/searchhandlers/CMakeLists.txt b/khelpcenter/searchhandlers/CMakeLists.txt index eeb76104b..9c2f7b527 100644 --- a/khelpcenter/searchhandlers/CMakeLists.txt +++ b/khelpcenter/searchhandlers/CMakeLists.txt @@ -10,17 +10,33 @@ ################################################# set( prefix ${CMAKE_INSTALL_PREFIX} ) +if( NOT DEFINED HTDIG_SEARCH_BINARY ) + message( STATUS "Looking for htsearch" ) + find_program( HTDIG_SEARCH_BINARY htsearch + HINTS + /srv/www/cgi-bin + /usr/lib/cgi-bin + ) + if( HTDIG_SEARCH_BINARY ) + message( STATUS "Looking for htsearch - ${HTDIG_SEARCH_BINARY}" ) + else( HTDIG_SEARCH_BINARY ) + tde_message_fatal( "htsearch not found!\n Please, install htdig or set HTDIG_SEARCH_BINARY." ) + endif( HTDIG_SEARCH_BINARY ) +endif( NOT DEFINED HTDIG_SEARCH_BINARY ) + configure_file( khc_docbookdig.pl.in khc_docbookdig.pl @ONLY ) configure_file( khc_htdig.pl.in khc_htdig.pl @ONLY ) +configure_file( khc_htsearch.pl.in khc_htsearch.pl @ONLY ) install( FILES htdig.desktop man.desktop docbook.desktop DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/searchhandlers ) install( PROGRAMS - ${CMAKE_CURRENT_BINARY_DIR}/khc_htdig.pl khc_htsearch.pl - ${CMAKE_CURRENT_BINARY_DIR}/khc_docbookdig.pl khc_beagle_search.pl - khc_mansearch.pl khc_beagle_index.pl + ${CMAKE_CURRENT_BINARY_DIR}/khc_htdig.pl + ${CMAKE_CURRENT_BINARY_DIR}/khc_htsearch.pl + ${CMAKE_CURRENT_BINARY_DIR}/khc_docbookdig.pl + khc_beagle_search.pl khc_mansearch.pl khc_beagle_index.pl DESTINATION ${BIN_INSTALL_DIR} ) install( FILES diff --git a/khelpcenter/searchhandlers/khc_htsearch.pl b/khelpcenter/searchhandlers/khc_htsearch.pl.in index 5dc3f5f71..28113bec2 100755..100644 --- a/khelpcenter/searchhandlers/khc_htsearch.pl +++ b/khelpcenter/searchhandlers/khc_htsearch.pl.in @@ -8,7 +8,7 @@ use Getopt::Long; use open IO => ':utf8'; use open ':std'; -my $htsearchpath="/srv/www/cgi-bin/htsearch"; +my $htsearchpath="@HTDIG_SEARCH_BINARY@"; my $config; my $format; my $method; diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index b76a5c4b1..cc3f7c437 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -1140,7 +1140,7 @@ void Konsole::makeBasicGUI() } m_detachSession->setEnabled(false); - m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, TQT_TQOBJECT(this), + m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::SHIFT+Qt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); if (kapp->authorizeTDEAction("zmodem_upload")) |