--- elvi/Makefile.in.orig	Wed Feb 28 11:47:19 2001
+++ elvi/Makefile.in	Wed Feb 28 13:50:38 2001
@@ -104,14 +104,14 @@ bin_SCRIPTS	= \
 		  xxx \
 		  yahoo
 
-sysconf_DATA	= surfraw_elvi.list
+data_DATA =	surfraw_elvi.list
 
 EXTRA_DIST	= $(bin_SCRIPTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 SCRIPTS =  $(bin_SCRIPTS)
 
-DATA =  $(sysconf_DATA)
+DATA =	$(data_DATA)
 
 DIST_COMMON =  Makefile.am Makefile.in
 
@@ -150,23 +150,23 @@ uninstall-binSCRIPTS:
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
 
-install-sysconfDATA: $(sysconf_DATA)
+install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	@list='$(sysconf_DATA)'; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	@list='$(data_DATA)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
+			echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p"; \
+			$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p; \
 	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
+			echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p"; \
+			$(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p; \
 	  fi; fi; \
 	done
 
-uninstall-sysconfDATA:
+uninstall-dataDATA:
 	@$(NORMAL_UNINSTALL)
-	list='$(sysconf_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(sysconfdir)/$$p; \
+	list='$(data_DATA)'; for p in $$list; do \
+		rm -f $(DESTDIR)$(datadir)/$$p; \
 	done
 tags: TAGS
 TAGS:
@@ -188,21 +188,21 @@ dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-exec: install-binSCRIPTS install-sysconfDATA
+install-exec: install-binSCRIPTS
 	@$(NORMAL_INSTALL)
 
-install-data: 
+install-data:	install-dataDATA
 	@$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
 
-uninstall: uninstall-binSCRIPTS uninstall-sysconfDATA
+uninstall: uninstall-binSCRIPTS uninstall-dataDATA
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
-	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(sysconfdir)
+	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)
 
 
 mostlyclean-generic:
@@ -230,8 +230,8 @@ maintainer-clean:  maintainer-clean-gene
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
-install-sysconfDATA tags distdir info dvi installcheck install-exec \
+.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-dataDATA \
+install-dataDATA tags distdir info dvi installcheck install-exec \
 install-data install uninstall all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean