diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/roff/groff/Makefile.sub | 25 |
2 files changed, 21 insertions, 14 deletions
@@ -1,3 +1,8 @@ +2013-04-29 Bernd Warken <groff-bernd.warken-72@web.de> + + * src/roff/groff/Makefile.sub: Replace some variables by shell + commands. Improve the output for the `make' runs. + 2013-04-28 Bernd Warken <groff-bernd.warken-72@web.de> * src/roff/groff/Makefile.sub: Make this Makefile compatible. @@ -14,8 +19,9 @@ * src/roff/groff/read_groff_options.pl: Remove this file. It's no longer needed. - * src/roff/groff/Makefile.sub: Get the `groff' options from the use of `getopt...' in `groff.cpp' using `$(EGREP)' and `sed'. - Store this information in a new file `groff_options.txt', which + * src/roff/groff/Makefile.sub: Get the `groff' options from the + use of `getopt...' in `groff.cpp' using `$(EGREP)' and `sed'. + Store this information in a new file `groff_options.txt', which is copied to `groff libdir' during the installation. 2013-04-26 Werner LEMBERG <wl@gnu.org> diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub index 67439c65..94e2f09e 100644 --- a/src/roff/groff/Makefile.sub +++ b/src/roff/groff/Makefile.sub @@ -37,30 +37,31 @@ HDRS=$(srcdir)/pipeline.h GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \ groff_opts_with_arg.txt -MOSTLYCLEANADD=$(GROFF_OPTS_OUTPUT) +MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT) RM=rm -f - -opts=`$(EGREP) -e ':.*:.*:' groff.cpp \ - | sed -e 's/[ \t",]//g')` - -opts_no_arg=`cat groff_opts_no_arg.txt` +EGREP=egrep .PHONY: all -all: groff.cpp $(GROFF_OPTS_OUTPUT) +all: groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT) + +groff_opts.tmp: groff.cpp + @$(EGREP) -e ':.*:.*:' $< \ + | sed -e 's/[ \t",]//g' > $@ + @echo -n 'groff options: ' + @cat $@ -groff_opts_no_arg.txt: groff.cpp +groff_opts_no_arg.txt: groff_opts.tmp @$(RM) $@ - @echo groff options: $(opts) - @echo $(opts) \ + @cat $< \ | sed -e 's/[a-zA-Z]://g' > $@ @echo -n 'no arg: ' @cat $@ groff_opts_with_arg.txt: groff_opts_no_arg.txt @$(RM) $@ - @echo $(opts) \ - | sed "s/[$(opts_no_arg):]//g" > $@ + @cat groff_opts.tmp \ + | sed "s/[`cat $<`:]//g" > $@ @echo -n 'with arg: ' @cat $@ |