This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Support --with-pkgversion and --with-bugurl


On Fri, 9 Nov 2012, Roland McGrath wrote:

> >  define format-me
> 
> This actually now has no other user (it used to be used for NOTES too, but
> we punted that file).  So it might as well just be direct commands in the
> INSTALL target.
> 
> >  @rm -f $@
> > -makeinfo --no-validate --plaintext --no-number-sections $< -o $@
> > +makeinfo --no-validate --plaintext --no-number-sections \
> > +	-I$(common-objpfx)manual $< -o $@
> 
> The second line should be indented to line up with the first argument,
> not just with a tab.
> 
> > +INSTALL: manual/install.texi manual/macros.texi \
> > +	$(common-objpfx)manual/pkgvers.texi
> > +	$(format-me)
> 
> Likewise in a continuation line, the second line of dependencies should be
> indented to line up with the first dependency.  In these cases, it matters
> even more, because a continuation line as you wrote it looks a lot like
> it's a command line.

I've applied this followup patch with those fixes.

2012-11-09  Joseph Myers  <joseph@codesourcery.com>

	* Makefile (format-me): Remove.
	(INSTALL): Adjust indentation.  Use commands directly instead of
	using $(format-me).

diff --git a/Makefile b/Makefile
index 78aaeb4..6c1e392 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:

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]