summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-02-07 02:51:30 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-02-07 03:35:28 +0100
commite01673a2efa421edb4c3b539afa54868a4f29c1f (patch)
tree1aac3419322749abafee34ddf22ecaee800661e0
parent1a452134a7eb0851cdccc0376e792d6c4c8b2216 (diff)
downloadtdebase-e01673a2efa421edb4c3b539afa54868a4f29c1f.tar.gz
tdebase-e01673a2efa421edb4c3b539afa54868a4f29c1f.zip
Add cmake rule to find htsearch binary
-rw-r--r--khelpcenter/searchhandlers/CMakeLists.txt22
-rw-r--r--[-rwxr-xr-x]khelpcenter/searchhandlers/khc_htsearch.pl.in (renamed from khelpcenter/searchhandlers/khc_htsearch.pl)2
2 files changed, 20 insertions, 4 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;