From c754e35b5b61bf6884016fff16730eb54e5fd88e Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 18 May 2009 09:05:21 -0400 Subject: [PATCH] Patch - Changed directory structure for scripts and their installation. From b6ec4af427c5c5d37f16b80236ccea34e4d8de5a Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Mon, 18 May 2009 12:32:55 +0200 Subject: [PATCH] Changed directory structure for scripts and their installation. $(docdir) now depends on ${VERSION} variable defined from configure.ac Made EXTRA_DIST variable modular. --- Makefile.am | 19 +++++-- Makefile.in | 131 ++++++++++++++++++++++++++++++++++-------------- src/Makefile.in | 20 ++++---- 3 files changed, 118 insertions(+), 52 deletions(-) diff --git a/Makefile.am b/Makefile.am index ef5a91973..5d240ad25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,19 @@ SUBDIRS = src -EXTRA_DIST = task_completion.sh doc/man1/task.1 doc/man5/taskrc.5 + +MAN_DIST = doc/man1/task.1 doc/man5/taskrc.5 +SCRIPTS_DIST = scripts/bash/task_completion.sh scripts/zsh/_task +EXTRA_DIST = $(MAN_DIST) $(SCRIPTS_DIST) + man1_MANS = doc/man1/task.1 man5_MANS = doc/man5/taskrc.5 -otherdir = $(datadir)/doc/task-1.7.0 -other_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README task_completion.sh + +docdir = $(datadir)/doc/${PACKAGE}-${VERSION} +doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README + +scriptsbasedir = $(docdir)/scripts + +bashscriptsdir = $(scriptsbasedir)/bash +bashscripts_DATA = scripts/bash/task_completion.sh + +zshscriptsdir = $(scriptsbasedir)/zsh +zshscripts_DATA = scripts/zsh/_task diff --git a/Makefile.in b/Makefile.in index ef5a3619f..6b2690e1f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,7 +55,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ps-recursive uninstall-recursive man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(otherdir)" + "$(DESTDIR)$(bashscriptsdir)" "$(DESTDIR)$(docdir)" \ + "$(DESTDIR)$(zshscriptsdir)" man5dir = $(mandir)/man5 NROFF = nroff MANS = $(man1_MANS) $(man5_MANS) @@ -65,8 +66,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -otherDATA_INSTALL = $(INSTALL_DATA) -DATA = $(other_DATA) +bashscriptsDATA_INSTALL = $(INSTALL_DATA) +docDATA_INSTALL = $(INSTALL_DATA) +zshscriptsDATA_INSTALL = $(INSTALL_DATA) +DATA = $(bashscripts_DATA) $(doc_DATA) $(zshscripts_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive ETAGS = etags @@ -145,7 +148,7 @@ build_alias = @build_alias@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -docdir = @docdir@ +docdir = $(datadir)/doc/${PACKAGE}-${VERSION} dvidir = @dvidir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -169,14 +172,21 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = src -EXTRA_DIST = task_completion.sh doc/man1/task.1 doc/man5/taskrc.5 +MAN_DIST = doc/man1/task.1 doc/man5/taskrc.5 +SCRIPTS_DIST = scripts/bash/task_completion.sh scripts/zsh/_task +EXTRA_DIST = $(MAN_DIST) $(SCRIPTS_DIST) man1_MANS = doc/man1/task.1 man5_MANS = doc/man5/taskrc.5 -otherdir = $(datadir)/doc/task-1.7.0 -other_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README task_completion.sh +doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README +scriptsbasedir = $(docdir)/scripts +bashscriptsdir = $(scriptsbasedir)/bash +bashscripts_DATA = scripts/bash/task_completion.sh +zshscriptsdir = $(scriptsbasedir)/zsh +zshscripts_DATA = scripts/zsh/_task all: auto.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -321,22 +331,56 @@ uninstall-man5: echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ done -install-otherDATA: $(other_DATA) +install-bashscriptsDATA: $(bashscripts_DATA) @$(NORMAL_INSTALL) - test -z "$(otherdir)" || $(MKDIR_P) "$(DESTDIR)$(otherdir)" - @list='$(other_DATA)'; for p in $$list; do \ + test -z "$(bashscriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(bashscriptsdir)" + @list='$(bashscripts_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(otherDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(otherdir)/$$f'"; \ - $(otherDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(otherdir)/$$f"; \ + echo " $(bashscriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(bashscriptsdir)/$$f'"; \ + $(bashscriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(bashscriptsdir)/$$f"; \ done -uninstall-otherDATA: +uninstall-bashscriptsDATA: @$(NORMAL_UNINSTALL) - @list='$(other_DATA)'; for p in $$list; do \ + @list='$(bashscripts_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(otherdir)/$$f'"; \ - rm -f "$(DESTDIR)$(otherdir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(bashscriptsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(bashscriptsdir)/$$f"; \ + done +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ + $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done +install-zshscriptsDATA: $(zshscripts_DATA) + @$(NORMAL_INSTALL) + test -z "$(zshscriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(zshscriptsdir)" + @list='$(zshscripts_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(zshscriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(zshscriptsdir)/$$f'"; \ + $(zshscriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(zshscriptsdir)/$$f"; \ + done + +uninstall-zshscriptsDATA: + @$(NORMAL_UNINSTALL) + @list='$(zshscripts_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(zshscriptsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(zshscriptsdir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -414,8 +458,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -440,8 +484,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) auto.h.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -451,13 +495,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) auto.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) auto.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -528,6 +571,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -554,6 +601,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -617,7 +666,7 @@ check: check-recursive all-am: Makefile $(MANS) $(DATA) auto.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(otherdir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(bashscriptsdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(zshscriptsdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -663,7 +712,8 @@ info: info-recursive info-am: -install-data-am: install-man install-otherDATA +install-data-am: install-bashscriptsDATA install-docDATA install-man \ + install-zshscriptsDATA install-dvi: install-dvi-recursive @@ -699,7 +749,8 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-man uninstall-otherDATA +uninstall-am: uninstall-bashscriptsDATA uninstall-docDATA \ + uninstall-man uninstall-zshscriptsDATA uninstall-man: uninstall-man1 uninstall-man5 @@ -709,19 +760,21 @@ uninstall-man: uninstall-man1 uninstall-man5 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-man1 install-man5 install-otherDATA \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-man \ - uninstall-man1 uninstall-man5 uninstall-otherDATA + info-am install install-am install-bashscriptsDATA \ + install-data install-data-am install-docDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-man5 install-pdf install-pdf-am \ + install-ps install-ps-am install-strip install-zshscriptsDATA \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-bashscriptsDATA \ + uninstall-docDATA uninstall-man uninstall-man1 uninstall-man5 \ + uninstall-zshscriptsDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/Makefile.in b/src/Makefile.in index ea3982dc4..60381fbc4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,7 +50,7 @@ am_task_OBJECTS = Config.$(OBJEXT) Date.$(OBJEXT) T.$(OBJEXT) \ util.$(OBJEXT) text.$(OBJEXT) rules.$(OBJEXT) import.$(OBJEXT) task_OBJECTS = $(am_task_OBJECTS) task_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -153,6 +153,7 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp Timer.cpp color.cpp parse.cpp task.cpp command.cpp edit.cpp report.cpp util.cpp text.cpp rules.cpp import.cpp Config.h Date.h T.h TDB.h Table.h Grid.h Timer.h color.h task.h @@ -259,8 +260,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -272,8 +273,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -283,13 +284,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique