--- contrib/Makefile.in.orig	Sat Jun 25 17:55:03 2005
+++ contrib/Makefile.in	Wed Jul 27 15:53:34 2005
@@ -12,6 +12,7 @@
 mandir = @mandir@
 srcdir = @srcdir@
 docdir = @docdir@
+samplesdir = $(EXAMPLESDIR)
 top_srcdir = @top_srcdir@
 top_builddir = ..
 INSTALL = @INSTALL@
@@ -39,13 +40,13 @@
 check:
 
 install:
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
 	for f in $(SAMPLES) ; do \
-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir) ;	\
 	done
-	chmod 755 $(DESTDIR)$(docdir)/samples/update-config.pl
+	chmod 755 $(DESTDIR)$(samplesdir)/update-config.pl
 	for f in $(srcdir)/iconv/*.rc ; do					\
-		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
+		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv	  ;	\
 	done
 
 # Nothing needs to be done - uninstall in doc removes samples as well.