--- unrtf-0.21.0.old/configure.ac	2009-01-27 21:54:02.000000000 +0100
+++ unrtf-0.21.0.new/configure.ac	2009-01-27 21:54:02.000000000 +0100
@@ -49,6 +49,7 @@
 AC_CONFIG_FILES([Makefile
                  charmaps/Makefile
                  doc/Makefile
+                 doc/unrtf.1
                  outputs/Makefile
                  patches/Makefile
                  src/Makefile
--- unrtf-0.21.0.old/doc/unrtf.1.in	1970-01-01 01:00:00.000000000 +0100
+++ unrtf-0.21.0.new/doc/unrtf.1.in	2009-01-27 21:54:02.000000000 +0100
@@ -0,0 +1,110 @@
+.\" Copyright (C) 2000,2001,2004 by Zachary Smith
+.\"
+.\" Permission is granted to redistribute this file with UnRTF.
+.\"
+.TH UNRTF "GNU UnRTF 0.21.0"
+.SH NAME
+UnRTF \- converts document in RTF format to other formats
+.SH SYNOPSIS
+.BI "unrtf [" options "] [" file... ]
+.br
+.sp
+Options: 
+.BI [\-\-nopict]
+.BI [\-\-noremap]
+.BI [\-\-html]
+.BI [\-\-text]
+.BI [\-\-vt]
+.BI [\-\-rtf]
+.BI [\-\-latex]
+.BI [\-\-help]
+.BI [\-\-verbose]
+.BI [\-\-version]
+.BI [\-P\ config_search_path]
+.BI [\-t\ tags_file]
+.br
+.SH DESCRIPTION
+The program
+.B unrtf
+is a converter from Rich Text Format (RTF) to a growing number
+of document formats. At present it supports
+Hypertext Markup Language (HTML), plain text, text with VT100 codes,
+LaTeX, and RTF itself.
+It is possible to produce troff files with macro calls; an example configuration
+for troff and the mm macro package is provided.
+All output formats except HTML are "alpha" i.e. limited and development
+has just begun.
+However with HTML, the program supports tables, fonts, 
+hyperlinks, and paragraph alignment. Font support includes
+face and size changes, as well as 
+typical attributes such as italic, bold, 
+underlining, strikethrough, smallcaps, allcaps, expand, compress
+and both foreground and background colors.
+Images are always stored to separate files in the current
+directory, or they can be ignored.
+.P
+Starting with version 0.21.0, all control of unrtf output is through
+runtime configuration files.  This makes it easy for users to fine-tune the
+output, and/or define new output formats.  The configuration files can
+be read from the distributed ones, or from user files, searched for in the 
+.I config_search_path .
+.P
+Code page conversion is performed with the iconv(3) package.
+.SH OPTIONS
+.TP
+\-\-nopict 
+disables the automatic storing of embedded pictures to
+the current directory.
+.TP
+\-\-noremap
+disables charset conversion (currently only works for 8-bit charsets).
+.TP
+\-\-html
+selects HTML output (default).
+.TP
+\-\-rtf
+selects RTF output.  The resulting output will often be much smaller
+than the input.
+.TP
+\-\-text
+selects plain ASCII text output.
+.TP
+\-\-vt
+selects text output with VT100 escape codes.
+.TP
+\-\-latex
+selects output of a LaTeX document.
+.TP
+\-\-verbose 
+prints additional information.
+.TP
+\-\-version 
+prints the program version.
+.TP
+\-t tags_file
+specifies the tags output configuration file to be used. The command
+"unrtf -t html" is functionally identical to "unrtf --html".  The
+configuration files are a simple format.  To change the behaviour of
+unrtf, a local copy of a system configuration file can be be made and
+edited.  The most complete file and hence the best starting point is
+@libdir@/@PACKAGE@/outputs/html.
+.TP
+\-P config_search_path
+specifies the directories in which the configuration file for the specified
+format will be sought.  The path can be provided as a single directory
+or a list of colon separated directories. 
+The default is @libdir@/@PACKAGE@/outputs/ where distributed output
+configuration files are installed.
+.SH FILES
+.TP
+@libdir@/@PACKAGE@/outputs/*
+- run time output configuration files.
+.TP
+@libdir@/@PACKAGE@/charmaps/SYMBOL
+- UTF encoding of the SYMBOL font
+used in many RTF files.  Unfortunately the iconv package does not include
+font encodings.  The format is identical to iconv code page files.
+.SH WEBSITE
+http://www.gnu.org/software/unrtf/unrtf.html
+.SH NOTES
+Report bugs in the program to daved@physiol.usyd.edu.au
--- unrtf-0.21.0.old/src/Makefile.am	2009-01-27 21:54:02.000000000 +0100
+++ unrtf-0.21.0.new/src/Makefile.am	2009-01-27 21:54:02.000000000 +0100
@@ -19,3 +19,6 @@
 		util.c util.h         \
 		word.c word.h
 
+AM_CFLAGS = -DDEFAULT_UNRTF_SEARCH_PATH='"${libdir}/${PACKAGE}/outputs/"' \
+            -DCONFIG_DIR='"${libdir}/${PACKAGE}/outputs/"' \
+            -DCHARMAP_DIR='"${libdir}/${PACKAGE}/charmaps/"'
--- unrtf-0.21.0.old/src/main.h	2009-01-27 21:54:02.000000000 +0100
+++ unrtf-0.21.0.new/src/main.h	2009-01-27 21:54:02.000000000 +0100
@@ -32,6 +32,7 @@
  * 29 Mar 05, daved@physiol.usyd.edu.au: changes requested by ZT Smith
  * 16 Dec 07, daved@physiol.usyd.edu.au: updated to GPL v3
  * 09 Nov 08, arkadiusz.firus@gmail.com: define CONFIG_DIR
+ * 27 Jan 09, sergio_gcg@telefonica.net: test if CONFIG_DIR is defined
  *--------------------------------------------------------------------*/
 
 
@@ -46,7 +47,10 @@
 #include "output.h"
 #endif
 
+#ifndef CONFIG_DIR
 #define CONFIG_DIR "/usr/local/lib/unrtf/outputs/"
+#endif
+
 #define DEFAULT_OUTPUT "html"
 
 extern OutputPersonality *op;
--- unrtf-0.21.0.old/src/my_iconv.h	2009-01-27 21:54:02.000000000 +0100
+++ unrtf-0.21.0.new/src/my_iconv.h	2009-01-27 21:58:47.000000000 +0100
@@ -3,14 +3,20 @@
  * Author name:  Arkadiusz Firus
  * Create date:  01 Jul 08
  * Purpose:    my_conv definitions
+ *----------------------------------------------------------------------
+ * Changes:
+ * 27 Jan 09, sergio_gcg@telefonica.net: test if CHARMAP_DIR is defined
  *--------------------------------------------------------------------*/
 
+
 #ifndef HAVE_ICONV_H
 #include <iconv.h>
 #define HAVE_ICONV_H
 #endif
 
+#ifndef CHARMAP_DIR
 #define CHARMAP_DIR "/usr/local/lib/unrtf/charmaps/"
+#endif
 #define char_table_size 256
 
 typedef struct
--- unrtf-0.21.0.old/src/path.h	2009-01-27 21:54:02.000000000 +0100
+++ unrtf-0.21.0.new/src/path.h	2009-01-27 21:54:02.000000000 +0100
@@ -1,4 +1,12 @@
+/*----------------------------------------------------------------------
+ * Changes:
+ * 27 Jan 09, sergio_gcg@telefonica.net: test if
+ *   DEFAULT_UNRTF_SEARCH_PATH is defined
+ *--------------------------------------------------------------------*/
+
+#ifndef DEFAULT_UNRTF_SEARCH_PATH
 #define DEFAULT_UNRTF_SEARCH_PATH	"/usr/local/lib/unrtf/outputs/"
+#endif
 
 char	*search_path;
 int	n_path_dirs;
