Simplified the build instructions now that we have "prepare-source".

[rsync/rsync-patches.git] / atimes.diff

diff --git a/atimes.diff b/atimes.diff
index c7afea4..76b45fd 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -1,7 +1,8 @@
-After applying this patch and running configure, you MUST run this
-command before "make":
+After applying this patch, run these commands for a successful build:
 
-    make proto
+    ./prepare-source
+    ./configure                      (optional if already run)
+    make
 
 
 --- orig/flist.c       2006-01-31 02:30:18
@@ -455,7 +456,7 @@ command before "make":
        if (preserve_perms)
                argstr[x++] = 'p';
        else if (preserve_executability && am_sender)
---- orig/rsync.c       2006-02-05 04:53:34
+--- orig/rsync.c       2006-02-05 15:31:49
 +++ rsync.c    2006-01-31 03:00:22
 @@ -37,6 +37,7 @@ extern int preserve_perms;
  extern int preserve_executability;
@@ -465,7 +466,7 @@ command before "make":
  extern int orig_umask;
  extern int am_root;
  extern int am_server;
-@@ -113,6 +114,7 @@ int set_file_attrs(char *fname, struct f
+@@ -116,6 +117,7 @@ int set_file_attrs(char *fname, struct f
        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;
@@ -473,7 +474,7 @@ command before "make":
  
        if (!st) {
                if (dry_run)
-@@ -131,18 +133,33 @@ int set_file_attrs(char *fname, struct f
+@@ -134,18 +136,33 @@ int set_file_attrs(char *fname, struct f
                }
        }
  
@@ -551,7 +552,7 @@ command before "make":
  /*
   * Start the flist array at FLIST_START entries and grow it
   * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
---- orig/rsync.yo      2006-02-05 06:58:50
+--- orig/rsync.yo      2006-02-05 15:31:49
 +++ rsync.yo   2006-01-31 03:06:45
 @@ -323,8 +323,9 @@ to the detailed description below for a 
       --devices               preserve device files (super-user only)
@@ -565,7 +566,7 @@ command before "make":
       --super                 receiver attempts super-user activities
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
-@@ -796,6 +797,12 @@ it is preserving modification times (see
+@@ -800,6 +801,12 @@ it is preserving modification times (see
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  
@@ -578,7 +579,7 @@ command before "make":
  dit(bf(--super)) This tells the receiving side to attempt super-user
  activities even if the receiving rsync wasn't run by the super-user.  These
  activities include: preserving users via the bf(--owner) option, preserving
-@@ -1303,8 +1310,8 @@ if the receiving rsync is at least versi
+@@ -1307,8 +1314,8 @@ if the receiving rsync is at least versi
  with older versions of rsync, but that also turns on the output of other
  verbose messages).
  
@@ -589,7 +590,7 @@ command before "make":
  kind of update being done, bf(X) is replaced by the file-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -1344,9 +1351,13 @@ quote(itemize(
+@@ -1348,9 +1355,13 @@ quote(itemize(
    by the file transfer.
    it() A bf(t) means the modification time is different and is being updated
    to the sender's value (requires bf(--times)).  An alternate value of bf(T)