Index: etc/Makefile.in --- etc/Makefile.in.orig +++ etc/Makefile.in @@ -70,7 +70,7 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ +pkgdatadir = $(datadir)/examples/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -542,30 +542,10 @@ uninstall-am: uninstall-pkgdataDATA uninstall-sysconfD install-data-local: all - @if test "$(DO_CONF_INSTALL)" = "yes"; then \ - if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \ - echo ""; \ - echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists. See "; \ - echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \ - echo " *** examples."; \ - echo ""; \ - else \ - $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \ - fi; \ - if test ! -f $(DESTDIR)$(sysconfdir)/rancid.types.conf ; then \ - $(INSTALL_DATA) rancid.types.conf $(DESTDIR)$(sysconfdir)/rancid.types.conf; \ - fi; \ - if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \ - echo ""; \ - echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists. See "; \ - echo " *** $(pkgdatadir)/lg.conf.sample for new"; \ - echo " *** examples."; \ - echo ""; \ - else \ - $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \ - fi; \ - fi; \ - $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + $(INSTALL_DATA) ../cloginrc.sample $(DESTDIR)$(pkgdatadir)/cloginrc.sample; \ + $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(pkgdatadir)/rancid.conf.sample; \ + $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(pkgdatadir)/rancid.types.base lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in rm -f lg.conf.sample lg.conf.sample.tmp; \