[packages/dox.git] / dox-destpaths.patch

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
         ;;
+	-htsearch)
+		shift
+		HTSEARCH=$1
+		;;
     esac
     shift
 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
+
 COPY = cp -p
 
 all: config.status
@@ -40,43 +43,43 @@
 
 install: config.status
 	source config.status ; \
-	mkdir -p $$PREFIX/bin ; \
-	$(COPY) dox/dox $$PREFIX/bin ; \
-	$(COPY) man2html/dox-man2html $$PREFIX/bin ; \
-	$(COPY) info2html/dox-info2html $$PREFIX/bin ; \
-	$(COPY) tags2dox/dox-tags2dox $$PREFIX/bin ; \
-	$(COPY) htdig/dox-htdig $$PREFIX/bin ; \
-	mkdir -p $$PREFIX/share/dox/scripts ; \
-	$(COPY) pydoc2html/dox_pydoc.py $$PREFIX/share/dox/scripts ; \
-	$(COPY) pydoc2html/dox_inspect.py $$PREFIX/share/dox/scripts ; \
-	mkdir -p $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/wrapper.html $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/nomatch.html $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/syntax.html $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/star.png $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/star_blank.png $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/bad_words $$PREFIX/share/dox/htdig ; \
-	mkdir -p $$PREFIX/man/man1 ; \
-	mkdir -p $$PREFIX/man/man5 ; \
-	$(COPY) data/dox.1 $$PREFIX/man/man1 ; \
-	$(COPY) data/dox.5 $$PREFIX/man/man5 ; \
-	$(COPY) data/dox-man2html.1 $$PREFIX/man/man1 ; \
-	$(COPY) data/dox-info2html.1 $$PREFIX/man/man1 ; \
-	$(COPY) data/dox-tags2dox.1 $$PREFIX/man/man1 ; \
-	$(COPY) data/dox-htdig.1 $$PREFIX/man/man1 ; \
-	mkdir -p $$PREFIX/share/dox/html/libc ; \
-	$(COPY) libc/*.html $$PREFIX/share/dox/html/libc ; \
-	mkdir -p $$PREFIX/share/dox/tocs ; \
-	$(COPY) libc/libc.toc $$PREFIX/share/dox/tocs/libc.toc ; \
-	mkdir -p $$PREFIX/share/dox/indices ; \
-	$(COPY) libc/libc.index $$PREFIX/share/dox/indices/libc.index ; \
-	mkdir -p $$PREFIX/share/dox/html/stl ; \
-	$(COPY) stl/*.html stl/*.gif $$PREFIX/share/dox/html/stl ; \
-	$(COPY) stl/stl.toc $$PREFIX/share/dox/tocs/STL.toc ; \
-	$(COPY) stl/stl.index $$PREFIX/share/dox/indices/STL.index ; \
-	$(COPY) data/perl.toc $$PREFIX/share/dox/tocs/Perl.toc ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) dox/dox $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) man2html/dox-man2html $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) info2html/dox-info2html $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) tags2dox/dox-tags2dox $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) htdig/dox-htdig $(DESTDIR)/$$PREFIX/bin ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
+	$(COPY) pydoc2html/dox_pydoc.py $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
+	$(COPY) pydoc2html/dox_inspect.py $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/wrapper.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/nomatch.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/syntax.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/star.png $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/star_blank.png $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/bad_words $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/man/man5 ; \
+	$(COPY) data/dox.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	$(COPY) data/dox.5 $(DESTDIR)/$$PREFIX/share/man/man5 ; \
+	$(COPY) data/dox-man2html.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	$(COPY) data/dox-info2html.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	$(COPY) data/dox-tags2dox.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	$(COPY) data/dox-htdig.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/html/libc ; \
+	$(COPY) libc/*.html $(DESTDIR)/$$PREFIX/share/dox/html/libc ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/tocs ; \
+	$(COPY) libc/libc.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/libc.toc ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/indices ; \
+	$(COPY) libc/libc.index $(DESTDIR)/$$PREFIX/share/dox/indices/libc.index ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/html/stl ; \
+	$(COPY) stl/*.html stl/*.gif $(DESTDIR)/$$PREFIX/share/dox/html/stl ; \
+	$(COPY) stl/stl.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/STL.toc ; \
+	$(COPY) stl/stl.index $(DESTDIR)/$$PREFIX/share/dox/indices/STL.index ; \
+	$(COPY) data/perl.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/Perl.toc ; \
 	if test "$${GNUSTEPDOCDIR+set}" = "set" ; then \
-	  $(COPY) data/gnustep.toc $$PREFIX/share/dox/tocs/GNUstep.toc ; \
+	  $(COPY) data/gnustep.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/GNUstep.toc ; \
 	fi ;
 
 config.status:
Commit	Line	Data
bad248d6	1	diff -Nurb dox.b/configure dox.n/configure
	2	--- dox.b/configure 2002-04-26 11:03:04.000000000 +0200
	3	+++ dox.n/configure 2005-01-09 02:48:09.576724992 +0100
	4	@@ -9,6 +9,10 @@
bc575588	5	shift
bc575588	6	PREFIX=$1
bc575588	7	;;
bad248d6	8	+ -htsearch)
	9	+ shift
	10	+ HTSEARCH=$1
	11	+ ;;
bc575588	12	esac
bc575588	13	shift
bad248d6	14	done
	15	@@ -28,40 +32,28 @@
	16
	17	htdig=`which htdig 2>/dev/null`
	18	if test -z "$htdig" ; then
	19	- if test -x "/opt/www/htdig/bin/htdig" ; then
	20	- htdig="/opt/www/htdig/bin/htdig"
	21	- fi
	22	+ htdig="$PREFIX/bin/htdig"
	23	fi
	24	if test -n "$htdig" ; then
	25	htmerge=`which htmerge 2>/dev/null`
	26	if test -z "$htmerge" ; then
	27	- if test -x "/opt/www/htdig/bin/htmerge" ; then
	28	- htmerge="/opt/www/htdig/bin/htmerge"
	29	- fi
	30	+ htmerge="$PREFIX/bin/htmerge"
	31	fi
	32	fi
	33	-if test -n "$htmerge" ; then
	34	+if test -z "$HTSEARCH" ; then
	35	+ if test -n "$htmerge" ; then
	36	htsearch=`which htsearch 2>/dev/null`
	37	if test -z "$htsearch" ; then
	38	- if test -x "/opt/www/cgi-bin/htsearch" ; then
	39	- htsearch="/opt/www/cgi-bin/htsearch"
	40	+ htsearch="$PREFIX/bin/htsearch"
	41	fi
	42	fi
	43	+else
	44	+ htsearch="$HTSEARCH"
	45	fi
	46
	47	-if test -n "$htsearch" ; then
	48	- echo "Found htdig as $htdig"
	49	- echo "Found htmerge as $htmerge"
	50	- echo "Found htsearch as $htsearch"
	51	-else
	52	- echo "Did not find htdig, htmerge or htsearch."
	53	- echo " Full text search will not be available."
	54	- echo " Make sure these binaries are in your \$PATH"
	55	- echo " and rerun configure if you have htdig installed."
	56	-fi
	57	-echo "#define HTDIG \"$htdig\"" >> config.h
	58	-echo "#define HTMERGE \"$htmerge\"" >> config.h
	59	-echo "#define HTSEARCH \"$htsearch\"" >> config.h
	60	+echo "#define HTDIG \"$htdig\"" \| tee -a config.h
	61	+echo "#define HTMERGE \"$htmerge\"" \| tee -a config.h
	62	+echo "#define HTSEARCH \"$htsearch\"" \| tee -a config.h
	63
	64	# whatis check
	65
	66	diff -Nurb dox.b/Makefile dox.n/Makefile
	67	--- dox.b/Makefile 2002-04-24 13:55:48.000000000 +0200
	68	+++ dox.n/Makefile 2005-01-09 02:43:04.614086000 +0100
bc575588	69	@@ -1,3 +1,6 @@
	70	+DESTDIR ?= /
	71	+PREFIX ?= /usr/local
	72	+
	73	COPY = cp -p
	74
	75	all: config.status
	76	@@ -40,43 +43,43 @@
	77
	78	install: config.status
	79	source config.status ; \
	80	- mkdir -p $$PREFIX/bin ; \
	81	- $(COPY) dox/dox $$PREFIX/bin ; \
	82	- $(COPY) man2html/dox-man2html $$PREFIX/bin ; \
	83	- $(COPY) info2html/dox-info2html $$PREFIX/bin ; \
	84	- $(COPY) tags2dox/dox-tags2dox $$PREFIX/bin ; \
	85	- $(COPY) htdig/dox-htdig $$PREFIX/bin ; \
	86	- mkdir -p $$PREFIX/share/dox/scripts ; \
	87	- $(COPY) pydoc2html/dox_pydoc.py $$PREFIX/share/dox/scripts ; \
	88	- $(COPY) pydoc2html/dox_inspect.py $$PREFIX/share/dox/scripts ; \
	89	- mkdir -p $$PREFIX/share/dox/htdig ; \
	90	- $(COPY) data/wrapper.html $$PREFIX/share/dox/htdig ; \
	91	- $(COPY) data/nomatch.html $$PREFIX/share/dox/htdig ; \
	92	- $(COPY) data/syntax.html $$PREFIX/share/dox/htdig ; \
	93	- $(COPY) data/star.png $$PREFIX/share/dox/htdig ; \
	94	- $(COPY) data/star_blank.png $$PREFIX/share/dox/htdig ; \
	95	- $(COPY) data/bad_words $$PREFIX/share/dox/htdig ; \
	96	- mkdir -p $$PREFIX/man/man1 ; \
	97	- mkdir -p $$PREFIX/man/man5 ; \
	98	- $(COPY) data/dox.1 $$PREFIX/man/man1 ; \
	99	- $(COPY) data/dox.5 $$PREFIX/man/man5 ; \
	100	- $(COPY) data/dox-man2html.1 $$PREFIX/man/man1 ; \
	101	- $(COPY) data/dox-info2html.1 $$PREFIX/man/man1 ; \
	102	- $(COPY) data/dox-tags2dox.1 $$PREFIX/man/man1 ; \
	103	- $(COPY) data/dox-htdig.1 $$PREFIX/man/man1 ; \
	104	- mkdir -p $$PREFIX/share/dox/html/libc ; \
	105	- $(COPY) libc/*.html $$PREFIX/share/dox/html/libc ; \
	106	- mkdir -p $$PREFIX/share/dox/tocs ; \
	107	- $(COPY) libc/libc.toc $$PREFIX/share/dox/tocs/libc.toc ; \
	108	- mkdir -p $$PREFIX/share/dox/indices ; \
	109	- $(COPY) libc/libc.index $$PREFIX/share/dox/indices/libc.index ; \
	110	- mkdir -p $$PREFIX/share/dox/html/stl ; \
	111	- $(COPY) stl/.html stl/.gif $$PREFIX/share/dox/html/stl ; \
	112	- $(COPY) stl/stl.toc $$PREFIX/share/dox/tocs/STL.toc ; \
	113	- $(COPY) stl/stl.index $$PREFIX/share/dox/indices/STL.index ; \
	114	- $(COPY) data/perl.toc $$PREFIX/share/dox/tocs/Perl.toc ; \
	115	+ mkdir -p $(DESTDIR)/$$PREFIX/bin ; \
	116	+ $(COPY) dox/dox $(DESTDIR)/$$PREFIX/bin ; \
	117	+ $(COPY) man2html/dox-man2html $(DESTDIR)/$$PREFIX/bin ; \
	118	+ $(COPY) info2html/dox-info2html $(DESTDIR)/$$PREFIX/bin ; \
	119	+ $(COPY) tags2dox/dox-tags2dox $(DESTDIR)/$$PREFIX/bin ; \
	120	+ $(COPY) htdig/dox-htdig $(DESTDIR)/$$PREFIX/bin ; \
	121	+ mkdir -p $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
	122	+ $(COPY) pydoc2html/dox_pydoc.py $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
	123	+ $(COPY) pydoc2html/dox_inspect.py $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
	124	+ mkdir -p $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
	125	+ $(COPY) data/wrapper.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
	126	+ $(COPY) data/nomatch.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
	127	+ $(COPY) data/syntax.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
	128	+ $(COPY) data/star.png $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
	129	+ $(COPY) data/star_blank.png $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
	130	+ $(COPY) data/bad_words $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
	131	+ mkdir -p $(DESTDIR)/$$PREFIX/share/man/man1 ; \
	132	+ mkdir -p $(DESTDIR)/$$PREFIX/share/man/man5 ; \
133	+ $(COPY) data/dox.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
134	+ $(COPY) data/dox.5 $(DESTDIR)/$$PREFIX/share/man/man5 ; \
135	+ $(COPY) data/dox-man2html.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
136	+ $(COPY) data/dox-info2html.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
137	+ $(COPY) data/dox-tags2dox.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
138	+ $(COPY) data/dox-htdig.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
139	+ mkdir -p $(DESTDIR)/$$PREFIX/share/dox/html/libc ; \
140	+ $(COPY) libc/*.html $(DESTDIR)/$$PREFIX/share/dox/html/libc ; \
141	+ mkdir -p $(DESTDIR)/$$PREFIX/share/dox/tocs ; \
142	+ $(COPY) libc/libc.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/libc.toc ; \
143	+ mkdir -p $(DESTDIR)/$$PREFIX/share/dox/indices ; \
144	+ $(COPY) libc/libc.index $(DESTDIR)/$$PREFIX/share/dox/indices/libc.index ; \
145	+ mkdir -p $(DESTDIR)/$$PREFIX/share/dox/html/stl ; \
146	+ $(COPY) stl/.html stl/.gif $(DESTDIR)/$$PREFIX/share/dox/html/stl ; \
147	+ $(COPY) stl/stl.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/STL.toc ; \
148	+ $(COPY) stl/stl.index $(DESTDIR)/$$PREFIX/share/dox/indices/STL.index ; \
149	+ $(COPY) data/perl.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/Perl.toc ; \
150	if test "$${GNUSTEPDOCDIR+set}" = "set" ; then \
151	- $(COPY) data/gnustep.toc $$PREFIX/share/dox/tocs/GNUstep.toc ; \
152	+ $(COPY) data/gnustep.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/GNUstep.toc ; \
153	fi ;
154
155	config.status: