From: twittner <twittner@pld-linux.org>
Date: Thu, 13 Jan 2005 18:49:36 +0000 (+0000)
Subject: - fixed htdig bin directory.
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdox.git;a=commitdiff_plain;h=bad248d6d99e4081071c07509ffabb9154b88493

- fixed htdig bin directory.

Changed files:
    dox-destpaths.patch -> 1.2
---

diff --git a/dox-destpaths.patch b/dox-destpaths.patch
index 25bf86e..6c5692a 100644
--- a/dox-destpaths.patch
+++ b/dox-destpaths.patch
@@ -1,26 +1,71 @@
-diff -Nurb dox-1.1.orig/configure dox-1.1.new/configure
---- dox-1.1.orig/configure	2002-04-26 11:03:04.000000000 +0200
-+++ dox-1.1.new/configure	2004-12-26 08:11:32.000000000 +0100
-@@ -2,12 +2,14 @@
- VERSION=1.1
- PREFIX=/usr/local
- 
--while [ -n "$1" ]
-+for A in "$@"
- do
--    case $1 in
-+    echo "A: $A"
-+    case $A in
-     -prefix)
+diff -Nurb dox.b/configure dox.n/configure
+--- dox.b/configure	2002-04-26 11:03:04.000000000 +0200
++++ dox.n/configure	2005-01-09 02:48:09.576724992 +0100
+@@ -9,6 +9,10 @@
          shift
          PREFIX=$1
-+	break
          ;;
++	-htsearch)
++		shift
++		HTSEARCH=$1
++		;;
      esac
      shift
-diff -Nurb dox-1.1.orig/Makefile dox-1.1.new/Makefile
---- dox-1.1.orig/Makefile	2002-04-24 13:55:48.000000000 +0200
-+++ dox-1.1.new/Makefile	2004-12-26 08:47:38.985952752 +0100
+ done
+@@ -28,40 +32,28 @@
+ 
+ htdig=`which htdig 2>/dev/null`
+ if test -z "$htdig" ; then
+-  if test -x "/opt/www/htdig/bin/htdig" ; then
+-    htdig="/opt/www/htdig/bin/htdig"
+-  fi
++  htdig="$PREFIX/bin/htdig"
+ fi
+ if test -n "$htdig" ; then
+   htmerge=`which htmerge 2>/dev/null`
+   if test -z "$htmerge" ; then
+-    if test -x "/opt/www/htdig/bin/htmerge" ; then
+-      htmerge="/opt/www/htdig/bin/htmerge"
+-    fi
++    htmerge="$PREFIX/bin/htmerge"
+   fi
+ fi
+-if test -n "$htmerge" ; then
++if test -z "$HTSEARCH" ; then
++  if test -n "$htmerge" ; then
+   htsearch=`which htsearch 2>/dev/null`
+   if test -z "$htsearch" ; then
+-    if test -x "/opt/www/cgi-bin/htsearch" ; then
+-      htsearch="/opt/www/cgi-bin/htsearch"
++      htsearch="$PREFIX/bin/htsearch"
+     fi
+   fi
++else
++  htsearch="$HTSEARCH"
+ fi
+ 
+-if test -n "$htsearch" ; then
+-  echo "Found htdig as $htdig"
+-  echo "Found htmerge as $htmerge"
+-  echo "Found htsearch as $htsearch"
+-else
+-  echo "Did not find htdig, htmerge or htsearch."
+-  echo "  Full text search will not be available."
+-  echo "  Make sure these binaries are in your \$PATH"
+-  echo "  and rerun configure if you have htdig installed."
+-fi  
+-echo "#define HTDIG \"$htdig\"" >> config.h
+-echo "#define HTMERGE \"$htmerge\"" >> config.h
+-echo "#define HTSEARCH \"$htsearch\"" >> config.h
++echo "#define HTDIG \"$htdig\"" | tee -a config.h
++echo "#define HTMERGE \"$htmerge\"" | tee -a config.h
++echo "#define HTSEARCH \"$htsearch\"" | tee -a config.h
+ 
+ # whatis check
+ 
+diff -Nurb dox.b/Makefile dox.n/Makefile
+--- dox.b/Makefile	2002-04-24 13:55:48.000000000 +0200
++++ dox.n/Makefile	2005-01-09 02:43:04.614086000 +0100
 @@ -1,3 +1,6 @@
 +DESTDIR ?= /
 +PREFIX ?= /usr/local