Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit c5a62c64 c5a62c646c7d60187273ff826aec37d774b391e8 by Sergey Poznyakoff
Options

Remove vestiges of scripts/ in Makefiles

1 parent 8b0317ff
Inline Side-by-side
Showing 2 changed files with 24 additions and 27 deletions
...@@ -59,34 +59,31 @@ SUBDIRS = \ ...@@ -59,34 +59,31 @@ SUBDIRS = \
59 59
60 EXTRA_DIST = COPYING.LESSER 60 EXTRA_DIST = COPYING.LESSER
61 61
62 .PHONY: make-ChangeLog 62 gen_start_date =
63 make-ChangeLog: 63 prev_change_log =
64 if test -d .git; then \
65 $(top_srcdir)/scripts/gitlog-to-changelog | \
66 sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t; \
67 echo " " >> $(distdir)/cl-t; \
68 echo "Local Variables:" >> $(distdir)/cl-t; \
69 echo "mode: change-log" >> $(distdir)/cl-t; \
70 echo "version-control: never" >> $(distdir)/cl-t; \
71 echo "buffer-read-only: t" >> $(distdir)/cl-t; \
72 echo "End:" >> $(distdir)/cl-t; \
73 rm -f $(distdir)/ChangeLog; \
74 mv $(distdir)/cl-t $(distdir)/ChangeLog; \
75 fi
76
77 dist-hook: make-ChangeLog
78 64
79 .PHONY: ChangeLog 65 .PHONY: ChangeLog
80 ChangeLog: 66 ChangeLog:
81 if test -d .git; then \ 67 @if test -d .git; then \
82 $(top_srcdir)/scripts/gitlog-to-changelog | \ 68 cmd=$(top_srcdir)/build-aux/gitlog-to-changelog; \
83 sed '/<unknown>$$/d' | fmt -s > ChangeLog; \ 69 if test -n "$(gen_start_date)"; then \
84 echo " " >> ChangeLog; \ 70 cmd="$$cmd --since=\"$(gen_start_date)\""; \
85 echo "Local Variables:" >> ChangeLog; \ 71 fi; \
86 echo "mode: change-log" >> ChangeLog; \ 72 $$cmd | \
87 echo "version-control: never" >> ChangeLog; \ 73 sed '/<unknown>$$/d' | fmt -s > cl-t; \
88 echo "buffer-read-only: t" >> ChangeLog; \ 74 if test -n "$(prev_change_log)" && test -f "$(prev_change_log)"; \
89 echo "End:" >> ChangeLog; \ 75 then \
76 echo "" >> cl-t; \
77 cat "$(prev_change_log)" | \
78 sed '/^Local Variables:/,/^End:/d' >> cl-t; \
79 fi; \
80 echo "Local Variables:" >> cl-t; \
81 echo "mode: change-log" >> cl-t; \
82 echo "version-control: never" >> cl-t; \
83 echo "buffer-read-only: t" >> cl-t; \
84 echo "End:" >> cl-t; \
85 rm -f ChangeLog; \
86 mv cl-t ChangeLog; \
90 fi 87 fi
91 88
92 alpha: 89 alpha:
......
...@@ -100,10 +100,10 @@ TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E ...@@ -100,10 +100,10 @@ TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
100 # Make sure you set TEXINPUTS. 100 # Make sure you set TEXINPUTS.
101 # TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions 101 # TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions
102 102
103 TEXINPUTS=$(srcdir):$(top_srcdir)/scripts:$$TEXINPUTS 103 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$$TEXINPUTS
104 104
105 manual: 105 manual:
106 TEXINPUTS=$(srcdir):$(top_srcdir)/scripts:$(TEXINPUTS) \ 106 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
107 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \ 107 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \
108 TEXI2DVI="$(TEXI2DVI) -t @finalout" \ 108 TEXI2DVI="$(TEXI2DVI) -t @finalout" \
109 $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual' 109 $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
......