--- a/conf.d/Makefile.am 2014-01-20 09:14:19.000000000 +0100 +++ b/conf.d/Makefile.am 2015-03-18 22:01:22.228445576 +0100 @@ -21,26 +21,9 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -BUILT_SOURCES = README -DOC_SOURCES = README.in DOC_FILES = $(DOC_SOURCES:.in=) -CONF_LINKS = \ - 10-scale-bitmap-fonts.conf \ - 20-unhint-small-vera.conf \ - 30-urw-aliases.conf \ - 30-metric-aliases.conf \ - 40-nonlatin.conf \ - 45-latin.conf \ - 49-sansserif.conf \ - 50-user.conf \ - 51-local.conf \ - 60-latin.conf \ - 65-fonts-persian.conf \ - 65-nonlatin.conf \ - 69-unifont.conf \ - 80-delicious.conf \ - 90-synthetic.conf +CONF_LINKS = EXTRA_DIST = $(template_DATA) $(DOC_SOURCES) CLEANFILES = $(DOC_FILES) @@ -80,24 +63,4 @@ template_DATA = \ 80-delicious.conf \ 90-synthetic.conf -README: $(srcdir)/README.in - sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@ - -install-data-hook: - mkdir -p $(DESTDIR)$(configdir) - @(echo cd $(DESTDIR)$(configdir); \ - cd $(DESTDIR)$(configdir); \ - for i in $(CONF_LINKS); do \ - echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \ - $(RM) $$i; \ - ln -s $(templatedir)/$$i .; \ - done) -uninstall-local: - @(echo cd $(DESTDIR)$(configdir); \ - cd $(DESTDIR)$(configdir); \ - for i in $(CONF_LINKS); do \ - echo $(RM) $$i; \ - $(RM) $$i; \ - done) - -include $(top_srcdir)/git.mk --- a/conf.d/Makefile.in 2014-03-24 07:04:15.000000000 +0100 +++ b/conf.d/Makefile.in 2015-03-18 22:06:52.180613814 +0100 @@ -163,7 +163,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(configdir)" "$(DESTDIR)$(templatedir)" +am__installdirs = "$(DESTDIR)$(templatedir)" DATA = $(config_DATA) $(template_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -324,25 +324,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -BUILT_SOURCES = README -DOC_SOURCES = README.in DOC_FILES = $(DOC_SOURCES:.in=) -CONF_LINKS = \ - 10-scale-bitmap-fonts.conf \ - 20-unhint-small-vera.conf \ - 30-urw-aliases.conf \ - 30-metric-aliases.conf \ - 40-nonlatin.conf \ - 45-latin.conf \ - 49-sansserif.conf \ - 50-user.conf \ - 51-local.conf \ - 60-latin.conf \ - 65-fonts-persian.conf \ - 65-nonlatin.conf \ - 69-unifont.conf \ - 80-delicious.conf \ - 90-synthetic.conf +CONF_LINKS = EXTRA_DIST = $(template_DATA) $(DOC_SOURCES) CLEANFILES = $(DOC_FILES) @@ -504,7 +487,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(configdir)" "$(DESTDIR)$(templatedir)"; do \ + for dir in "$(DESTDIR)$(templatedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -625,9 +608,6 @@ uninstall-am: uninstall-configDATA unins uninstall-local uninstall-templateDATA -README: $(srcdir)/README.in - sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@ - install-data-hook: mkdir -p $(DESTDIR)$(configdir) @(echo cd $(DESTDIR)$(configdir); \