--- charsets/Makefile.in.orig	2002-01-30 21:00:58.000000000 +0100
+++ charsets/Makefile.in	2003-01-12 13:09:52.000000000 +0100
@@ -23,21 +23,21 @@
 
 REPL_EXT=@replsuffix@
 SPEC_EXT=@specsuffix@
-LIB_DIR=$(libdir)/catdoc
+DATA_DIR=$(datadir)/catdoc
 
 all: @charsetcheck@
 clean:
 install: install-dirs install-spc install-charsets
 install-spc: tex.spc ascii.spc tex.rpl ascii.rpl
-	    $(INSTALL) -m 644 ascii.spc $(installroot)$(LIB_DIR)/ascii$(SPEC_EXT) 
-	    $(INSTALL) -m 644 tex.spc $(installroot)$(LIB_DIR)/tex$(SPEC_EXT) 
-	    $(INSTALL) -m 644 ascii.rpl $(installroot)$(LIB_DIR)/ascii$(REPL_EXT)
-	    $(INSTALL) -m 644 tex.rpl $(installroot)$(LIB_DIR)/tex$(REPL_EXT)
+	    $(INSTALL) -m 644 ascii.spc $(installroot)$(DATA_DIR)/ascii$(SPEC_EXT) 
+	    $(INSTALL) -m 644 tex.spc $(installroot)$(DATA_DIR)/tex$(SPEC_EXT) 
+	    $(INSTALL) -m 644 ascii.rpl $(installroot)$(DATA_DIR)/ascii$(REPL_EXT)
+	    $(INSTALL) -m 644 tex.rpl $(installroot)$(DATA_DIR)/tex$(REPL_EXT)
 install-charsets:
 	for i in *.txt; do\
-	   $(INSTALL) -m 0644 $$i $(installroot)$(LIB_DIR);\
+	   $(INSTALL) -m 0644 $$i $(installroot)$(DATA_DIR);\
 	done
 install-dirs:
-	../mkinstalldirs $(installroot)$(LIB_DIR)
+	../mkinstalldirs $(installroot)$(DATA_DIR)
 distclean:
 	rm Makefile
--- src/Makefile.in.orig	2002-01-30 21:00:58.000000000 +0100
+++ src/Makefile.in	2003-01-12 13:44:44.000000000 +0100
@@ -9,6 +9,7 @@
 installroot = @installroot@
 
 bindir = @bindir@
+datadir = @datadir@
 libdir = @libdir@
 mandir = @mandir@
 INSTALL = @INSTALL@
@@ -23,18 +24,18 @@
 #Compile-time configuration of catdoc itself. Edit according to taste
 
 #Directory, where all system-wide stuff resides
-LIB_DIR=$(libdir)/catdoc
+DATA_DIR=$(datadir)/catdoc
 #directory, where catdoc binary would be placed
 #directory where to put man page
 
 #System-wide configuration file
-SYSTEMRC=$(LIB_DIR)/catdocrc
+SYSTEMRC=$(DATA_DIR)/catdocrc
 
 #Per-user configration file (in user's home directory
 USERRC=.catdocrc
 
 # path where to search for charsets. may be colon-separated list of dirs
-CHARSETPATH=$(LIB_DIR)
+CHARSETPATH=$(DATA_DIR)
 
 # Extension for map of special character
 SPEC_EXT=@specsuffix@
@@ -85,7 +86,7 @@
 	$(INSTALL) -m 755 wordview $(installroot)$(bindir)/wordview
 wordview: wordview.tcl
 	echo "#! $(WISH)" >wordview
-	echo set charset_lib "\"$(LIB_DIR)\"">>wordview
+	echo set charset_lib "\"$(DATA_DIR)\"">>wordview
 	cat wordview.tcl >>wordview
 	chmod 0755 wordview
 clean: