diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 4fa11c3..42eb5dc 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -33,47 +33,47 @@ 'configure.ac' ], { - '_AM_PROG_TAR' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AU_DEFUN' => 1, - 'AM_RUN_LOG' => 1, '_AM_AUTOCONF_VERSION' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - '_AM_IF_OPTION' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_SUBST_NOTMAKE' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'include' => 1, '_AM_SET_OPTION' => 1, - 'AM_MISSING_PROG' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'AM_PROG_CC_C_O' => 1, - '_AM_PROG_CC_C_O' => 1, - 'AC_DEFUN' => 1, - '_AM_SET_OPTIONS' => 1, - 'm4_include' => 1, - 'm4_pattern_forbid' => 1, + 'AM_PROG_INSTALL_SH' => 1, 'AM_DEP_TRACK' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - '_AM_MANGLE_OPTION' => 1, - 'AM_MAKE_INCLUDE' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_m4_warn' => 1, - 'm4_pattern_allow' => 1, - 'AC_DEFUN_ONCE' => 1, - 'AM_INIT_AUTOMAKE' => 1, + '_AM_SET_OPTIONS' => 1, + 'AM_SUBST_NOTMAKE' => 1, + '_AM_DEPENDENCIES' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, 'AM_SILENT_RULES' => 1, - 'AM_SET_DEPDIR' => 1, 'AM_MISSING_HAS_RUN' => 1, + '_m4_warn' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + '_AM_PROG_TAR' => 1, + 'AM_MISSING_PROG' => 1, + 'AC_DEFUN' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'm4_pattern_forbid' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AM_CONDITIONAL' => 1, 'AM_SANITY_CHECK' => 1, - '_AM_DEPENDENCIES' => 1 + 'include' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'm4_pattern_allow' => 1, + '_AM_PROG_CC_C_O' => 1, + 'm4_include' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AM_RUN_LOG' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AM_SET_DEPDIR' => 1, + 'AU_DEFUN' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_AM_IF_OPTION' => 1, + '_AM_SUBST_NOTMAKE' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -88,69 +88,69 @@ 'configure.ac' ], { - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AM_NLS' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_FC_FREEFORM' => 1, - 'IT_PROG_INTLTOOL' => 1, - 'AM_PROG_MOC' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_POT_TOOLS' => 1, - 'm4_include' => 1, '_AM_MAKEFILE_INCLUDE' => 1, - 'AC_INIT' => 1, - 'm4_pattern_forbid' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AM_PROG_F77_C_O' => 1, - 'include' => 1, - 'sinclude' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_CONDITIONAL' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_SUBST' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'm4_sinclude' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AM_PROG_AR' => 1, - 'AC_FC_SRCEXT' => 1, - '_AM_COND_ELSE' => 1, - 'AC_CONFIG_FILES' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'm4_pattern_allow' => 1, - '_m4_warn' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_PATH_GUILE' => 1, 'LT_INIT' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AM_PATH_GUILE' => 1, + 'AC_CANONICAL_HOST' => 1, 'AM_PROG_MKDIR_P' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AC_SUBST_TRACE' => 1, + 'IT_PROG_INTLTOOL' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_FC_FREEFORM' => 1, + 'AC_INIT' => 1, 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, 'AC_CANONICAL_BUILD' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_PROG_FC_C_O' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'include' => 1, + 'm4_pattern_allow' => 1, + 'AM_PROG_AR' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AM_PROG_MOC' => 1, + '_m4_warn' => 1, 'GTK_DOC_CHECK' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AM_POT_TOOLS' => 1, + 'AM_PROG_CC_C_O' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_SUBST' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, '_LT_AC_TAGCONFIG' => 1, - '_AM_COND_IF' => 1, + 'AC_FC_PP_SRCEXT' => 1, + '_AM_COND_ELSE' => 1, + 'AM_SILENT_RULES' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AC_LIBSOURCE' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_FC_SRCEXT' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_CONFIG_HEADERS' => 1, 'AH_OUTPUT' => 1, + 'm4_include' => 1, 'AC_FC_PP_DEFINE' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AC_SUBST_TRACE' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AC_CONFIG_FILES' => 1, + 'AM_PROG_FC_C_O' => 1, + 'm4_pattern_forbid' => 1, '_AM_COND_ENDIF' => 1, - 'AC_CONFIG_LINKS' => 1 + 'sinclude' => 1, + '_AM_COND_IF' => 1, + 'AM_NLS' => 1, + 'AM_GNU_GETTEXT' => 1, + 'm4_sinclude' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -166,69 +166,69 @@ 'configure.ac' ], { - 'AC_CONFIG_AUX_DIR' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AC_INIT' => 1, - 'm4_pattern_forbid' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'm4_include' => 1, - 'include' => 1, - 'sinclude' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AM_PROG_MOC' => 1, - 'IT_PROG_INTLTOOL' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_FC_FREEFORM' => 1, - 'AM_POT_TOOLS' => 1, - 'AM_ENABLE_MULTILIB' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_SUBDIRS' => 1, + 'AM_GNU_GETTEXT' => 1, 'AM_NLS' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_FC_PP_DEFINE' => 1, + 'm4_sinclude' => 1, '_AM_COND_IF' => 1, - 'AH_OUTPUT' => 1, - 'AC_CONFIG_LINKS' => 1, '_AM_COND_ENDIF' => 1, + 'sinclude' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'm4_pattern_forbid' => 1, + 'AC_CONFIG_FILES' => 1, 'AM_PROG_FC_C_O' => 1, + 'AC_SUBST_TRACE' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AH_OUTPUT' => 1, + 'm4_include' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AC_FC_SRCEXT' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_PROG_LIBTOOL' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_LIBSOURCE' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AM_SILENT_RULES' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AC_FC_PP_SRCEXT' => 1, + '_AM_COND_ELSE' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_SUBST' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_POT_TOOLS' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AM_PROG_MOC' => 1, + '_m4_warn' => 1, + 'AC_CONFIG_LINKS' => 1, + 'GTK_DOC_CHECK' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AM_PROG_AR' => 1, + 'include' => 1, + 'm4_pattern_allow' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AM_XGETTEXT_OPTION' => 1, 'AM_EXTRA_RECURSIVE_TARGETS' => 1, 'AC_CANONICAL_BUILD' => 1, - 'AC_PROG_LIBTOOL' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'GTK_DOC_CHECK' => 1, - '_m4_warn' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AC_SUBST_TRACE' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'LT_INIT' => 1, + 'IT_PROG_INTLTOOL' => 1, 'AM_PROG_MKDIR_P' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_PATH_GUILE' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'm4_sinclude' => 1, - 'AC_SUBST' => 1, - 'm4_pattern_allow' => 1, - 'AM_SILENT_RULES' => 1, + 'AC_INIT' => 1, + 'AC_FC_FREEFORM' => 1, + 'AC_CONFIG_AUX_DIR' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_FILES' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_PROG_AR' => 1, - 'AC_FC_SRCEXT' => 1, - '_AM_COND_ELSE' => 1 + 'AM_PATH_GUILE' => 1, + 'LT_INIT' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'AC_CANONICAL_HOST' => 1 } ], 'Autom4te::Request' ) ); diff --git a/src/Makefile.in b/src/Makefile.in index 101194d..1487612 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -93,7 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(dist_bin_SCRIPTS) \ - $(dist_sysconf_DATA) $(am__DIST_COMMON) + $(dist_xslfeedconf_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -124,7 +124,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(xslfeedconfdir)" SCRIPTS = $(dist_bin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -145,7 +145,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA = $(dist_sysconf_DATA) +DATA = $(dist_xslfeedconf_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -226,8 +226,9 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +xslfeedconfdir = $(sysconfdir)/xslfeed dist_bin_SCRIPTS = combine-md-files generate-website-from-md get-feeds update-xslfeed -dist_sysconf_DATA = opml2list.xml rss2md.xml style.css +dist_xslfeedconf_DATA = opml2list.xml rss2md.xml style.css all: all-am .SUFFIXES: @@ -295,27 +296,27 @@ uninstall-dist_binSCRIPTS: files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) -install-dist_sysconfDATA: $(dist_sysconf_DATA) +install-dist_xslfeedconfDATA: $(dist_xslfeedconf_DATA) @$(NORMAL_INSTALL) - @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + @list='$(dist_xslfeedconf_DATA)'; test -n "$(xslfeedconfdir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(xslfeedconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(xslfeedconfdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xslfeedconfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(xslfeedconfdir)" || exit $$?; \ done -uninstall-dist_sysconfDATA: +uninstall-dist_xslfeedconfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + @list='$(dist_xslfeedconf_DATA)'; test -n "$(xslfeedconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(xslfeedconfdir)'; $(am__uninstall_files_from_dir) tags TAGS: ctags CTAGS: @@ -360,7 +361,7 @@ check-am: all-am check: check-am all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(xslfeedconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -413,13 +414,13 @@ info: info-am info-am: -install-data-am: +install-data-am: install-dist_xslfeedconfDATA install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-dist_binSCRIPTS install-dist_sysconfDATA +install-exec-am: install-dist_binSCRIPTS install-html: install-html-am @@ -457,7 +458,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_sysconfDATA +uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_xslfeedconfDATA .MAKE: install-am install-strip @@ -465,14 +466,14 @@ uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_sysconfDATA ctags-am distclean distclean-generic distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dist_binSCRIPTS \ - install-dist_sysconfDATA install-dvi install-dvi-am \ + install-dist_xslfeedconfDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags-am uninstall uninstall-am \ - uninstall-dist_binSCRIPTS uninstall-dist_sysconfDATA + uninstall-dist_binSCRIPTS uninstall-dist_xslfeedconfDATA .PRECIOUS: Makefile diff --git a/src/get-feeds b/src/get-feeds index fff6863..37cd1bb 100644 --- a/src/get-feeds +++ b/src/get-feeds @@ -1,6 +1,6 @@ #!/bin/sh -feeds=`xsltproc opml2list.xml $HOME/xslfeed/feeds.opml |\ +feeds=`xsltproc /etc/xslfeed/opml2list.xml $HOME/xslfeed/feeds.opml |\ sed -e 's/|//' -e 's/ :/ /' -e 's/: / /' -e 's/- / /' -e 's/ -/ /' \ -e 's/\([^"]\) \([^"]\)/\1_\2/g' -e 's/\([^"]\) \([^"]\)/\1_\2/g' -e 's/"//g' ` @@ -12,7 +12,8 @@ for el in $feeds; do string=$el else is_string=true - errs=`wget $el -O - | xsltproc -o $HOME/xslfeed/feeds/$string.md rss2md.xml -` + errs=`wget $el -O - |\ + xsltproc -o $HOME/xslfeed/feeds/$string.md /etc/xslfeed/rss2md.xml -` echo $errs fi done