[SCM] The rsync repository. - branch b3.0.x updated

[Rsync CVS commit messages]

The branch, b3.0.x has been updated
       via  62e9eb7 Mention need of wildcard support in make. See bug 7625.
       via  de20d72 Remove duplication for -x option.
      from  f8cd1c4 A couple more NEWS items.

;a=shortlog;h=b3.0.x


- Log -----------------------------------------------------------------
commit 62e9eb7bc2c593d40951f5099a36442537732a5c
Author: Wayne Davison <wayned at samba.org>
Date:   Thu Aug 26 08:27:20 2010 -0700

    Mention need of wildcard support in make.
    See bug 7625.

commit de20d72541d0059218dd17fa20ca761a8cf00523
Author: Wayne Davison <wayned at samba.org>
Date:   Thu Aug 26 07:58:22 2010 -0700

    Remove duplication for -x option.

-----------------------------------------------------------------------

Summary of changes:
 INSTALL   |   14 +++++++++++++-
 options.c |    4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/INSTALL b/INSTALL
index 6b10dae..ec551cc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,7 +17,7 @@ for the daemon by editing the NOBODY_USER and NOBODY_GROUP defines in
 config.h, or just override them in your /etc/rsyncd.conf file.
 
 As of 2.4.7, rsync uses Eric Troan's popt option-parsing library.  A
-cut-down copy of release 1.6.4 is included in the rsync distribution,
+cut-down copy of a recent release is included in the rsync distribution,
 and will be used if there is no popt library on your build host, or if
 the --with-included-popt option is passed to ./configure.
 
@@ -25,6 +25,18 @@ If you configure using --enable-maintainer-mode, then rsync will try
 to pop up an xterm on DISPLAY=:0 if it crashes.  You might find this
 useful, but it should be turned off for production builds.
 
+MAKE COMPATIBILITY
+------------------
+
+Note that Makefile.in has a rule that uses a wildcard in a prerequisite.  If
+your make has a problem with this rule, you will see an error like this:
+
+    Don't know how to make ./*.c
+
+You can change the "proto.h-tstamp" target to omit its prerequisite args,
+but keep in mind that this will make a manual removal of "proto.h-tstamp"
+necessary anytime the function prototypes change.
+
 RPM NOTES
 ---------
 
diff --git a/options.c b/options.c
index b428ce8..c01d71c 100644
--- a/options.c
+++ b/options.c
@@ -530,8 +530,8 @@ static struct poptOption long_options[] = {
   {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
   {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
   {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
-  {"no-one-file-system",'x',POPT_ARG_VAL,   &one_file_system, 0, 0, 0 },
-  {"no-x",            'x', POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
+  {"no-one-file-system",0, POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
+  {"no-x",             0,  POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
   {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
   {"ignore-non-existing",0,POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },


-- 
The rsync repository.