Hi John, > On 10/11/06, Jean Delvare <[EMAIL PROTECTED]> wrote: > > Hi all, > > > > There are lots of variables we define in Makefile but then never use. I > > think these are left over from the times we were substituting program > > names in every script rather than relying on the new compat layer. > > > > Any objection to the patch below which drops all unused variables? > > These variables are used in the Makefile by the compat layer; they are > used indirectly by the rules ... > > $(COMPAT_SYMLINKS:%=compat/%) :: Makefile # line 291 > > ... and > > install-compat-symlink-% :: install-compat1 # line 335
Ah, my bad, I completely missed these. On second thought, it was obvious - there _had_ to be somewhere where the results from ./configure were used, else why bother? > How about the following patch to make this clearer? > > --- quilt.orig/Makefile.in > +++ quilt/Makefile.in > @@ -16,29 +16,18 @@ > > INSTALL := @INSTALL@ > POD2MAN := @POD2MAN@ > -COLUMN := @COLUMN@ > -GETOPT := @GETOPT@ > -CP := @CP@ > -DATE := @DATE@ > PERL := @PERL@ > BASH := @BASH@ > -GREP := @GREP@ > -TAIL := @TAIL@ > -TR := @TR@ > SED := @SED@ > AWK := @AWK@ > FIND := @FIND@ > -DIFF := @DIFF@ > PATCH := @PATCH@ > -MKTEMP := @MKTEMP@ > MSGMERGE := @MSGMERGE@ > MSGFMT := @MSGFMT@ > XGETTEXT := @XGETTEXT@ > MSGUNIQ := @MSGUNIQ@ > MSGCAT := @MSGCAT@ > -DIFFSTAT := @DIFFSTAT@ > RPMBUILD := @RPMBUILD@ > -SENDMAIL := @SENDMAIL@ > > USE_NLS := @USE_NLS@ > PATCH_WRAPPER := @PATCH_WRAPPER@ > @@ -55,7 +44,24 @@ ifneq ($(LIBOBJS),) > CFLAGS += -Ilib > endif > > +# The following variables are evaluated indirectly in this > +# Makefile when the program is listed below in either > +# COMPAT_SYMLINKS or COMPAT_PROGRAMS Actually only in COMPAT_SYMLINKS. > +COLUMN := @COLUMN@ > +CP := @CP@ > +DATE := @DATE@ > +DIFF := @DIFF@ > +DIFFSTAT := @DIFFSTAT@ > +GETOPT := @GETOPT@ > +GREP := @GREP@ > +MKTEMP := @MKTEMP@ > +SENDMAIL := @SENDMAIL@ > +TAIL := @TAIL@ > +TR := @TR@ > + > +# Dependencies satisfied explictly using --with-prog > COMPAT_SYMLINKS := @COMPAT_SYMLINKS@ > +# Dependencies satisfied by a quilt supplied script > COMPAT_PROGRAMS := @COMPAT_PROGRAMS@ > > default: all I'm not even sure there's anything to clarify, I just had a drop of attention yesterday. Sorry for the stupid post and thanks for pointing out the obvious. -- Jean Delvare _______________________________________________ Quilt-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/quilt-dev
