Hi Kent, On Sun, 19 Jan 2014 15:41:23 -0600, Kent R. Spillner wrote: > Allow distributors to provide compat symlinks for cp and md5sum on > non-GNU systems. md5sum is used by quilt/scripts/inspect and is > provided by GNU coreutils, but may be installed as gmd5sum on some > systems (e.g. OpenBSD). quilt/scripts/backup-files invokes cp > with some non-portable GNU-specific command line arguments > (e.g. --parents --remove-destination --target-directory). > > Original diff from Jérémie Courrèges-Anglas <[email protected]> on > OpenBSD ports mailing list. > > Reported-by: Jérémie Courrèges-Anglas <[email protected]> > Signed-off-by: Kent R. Spillner <[email protected]> > --- > Makefile.in | 2 ++ > configure.ac | 3 +++ > 2 files changed, 5 insertions(+) > > diff --git a/Makefile.in b/Makefile.in > index 8040653..0b8092b 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -42,6 +42,8 @@ MSGCAT := @MSGCAT@ > DIFFSTAT := @DIFFSTAT@ > RPMBUILD := @RPMBUILD@ > SENDMAIL := @SENDMAIL@ > +CP := @CP@ > +MD5SUM := @MD5SUM@ > > USE_NLS := @USE_NLS@ > STAT_HARDLINK := @STAT_HARDLINK@ > diff --git a/configure.ac b/configure.ac > index b181dcf..09f270a 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -367,6 +367,9 @@ fi > > QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin]) > > +QUILT_COMPAT_PROG_PATH(CP, cp, [gcp cp]) > +QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum])
This is fine for md5sum, but not for cp. On some systems gcp is something different, for example: http://packages.debian.org/wheezy/gcp So you don't want to pick gcp and use it by default. You only want to allow the user to pass --with-cp=/path/to/gcp. The following should do exactly that: QUILT_COMPAT_PROG_PATH(CP, cp) > + > AC_PATH_PROG(MSGMERGE, [msgmerge]) > AC_PATH_PROG(MSGFMT, [msgfmt]) > AC_PATH_PROG(XGETTEXT, [xgettext]) Thanks, -- Jean Delvare Suse L3 Support _______________________________________________ Quilt-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/quilt-dev
