diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 011e854ad6..1914a03bcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-11-09 Joseph Myers <joseph@codesourcery.com> + * Makefile (format-me): Remove. + (INSTALL): Adjust indentation. Use commands directly instead of + using $(format-me). + * aclocal.m4 (ACX_PKGVERSION): New macro. (ACX_BUGURL): Likewise. * configure.in: Use ACX_PKGVERSION and ACX_BUGURL. diff --git a/Makefile b/Makefile index 78aaeb4d79..6c1e392f06 100644 --- a/Makefile +++ b/Makefile @@ -397,15 +397,11 @@ dist: dist-prepare fi endif -define format-me -@rm -f $@ -makeinfo --no-validate --plaintext --no-number-sections \ - -I$(common-objpfx)manual $< -o $@ --chmod a-w $@ -endef INSTALL: manual/install.texi manual/macros.texi \ - $(common-objpfx)manual/pkgvers.texi - $(format-me) + $(common-objpfx)manual/pkgvers.texi + makeinfo --no-validate --plaintext --no-number-sections \ + -I$(common-objpfx)manual $< -o $@ + -chmod a-w $@ $(common-objpfx)manual/%: FORCE $(MAKE) $(PARALLELMFLAGS) -C manual $@ FORCE: |