--- elvi/Makefile.in.orig Sat Jan 13 03:39:42 2001 +++ elvi/Makefile.in Wed Jul 18 01:16:36 2001 @@ -104,14 +104,14 @@ xxx \ yahoo -sysconf_DATA = surfraw_elvi.list +pkgdata_DATA = surfraw_elvi.list EXTRA_DIST = $(bin_SCRIPTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = SCRIPTS = $(bin_SCRIPTS) -DATA = $(sysconf_DATA) +DATA = $(pkgdata_DATA) DIST_COMMON = Makefile.am Makefile.in @@ -150,23 +150,23 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done -install-sysconfDATA: $(sysconf_DATA) +install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - @list='$(sysconf_DATA)'; for p in $$list; do \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + @list='$(pkgdata_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)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$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)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ fi; fi; \ done -uninstall-sysconfDATA: +uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) - list='$(sysconf_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(sysconfdir)/$$p; \ + list='$(pkgdata_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ done tags: TAGS TAGS: @@ -188,7 +188,7 @@ check: all $(MAKE) installcheck: -install-exec: install-binSCRIPTS install-sysconfDATA +install-exec: install-binSCRIPTS install-pkgdataDATA @$(NORMAL_INSTALL) install-data: @@ -197,12 +197,12 @@ install: install-exec install-data all @: -uninstall: uninstall-binSCRIPTS uninstall-sysconfDATA +uninstall: uninstall-binSCRIPTS uninstall-pkgdataDATA install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(DATADIR)$(bindir) $(DATADIR)$(sysconfdir) + $(mkinstalldirs) $(DATADIR)$(bindir) $(DATADIR)$(pkgdatadir) mostlyclean-generic: @@ -230,8 +230,8 @@ @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-pkgdataDATA \ +install-pkgdataDATA 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