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

[rsync/rsync-patches.git] / link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 612cbf8..2bd0b7a 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.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
 
 Jason M. Felice writes:
 
@@ -11,7 +12,7 @@ will only store one copy of the unique contents of each file, regardless of
 the file's name.
 
 
---- orig/Makefile.in   2006-01-14 08:14:29
+--- orig/Makefile.in   2006-02-06 05:03:50
 +++ Makefile.in        2005-11-07 04:37:17
 @@ -34,7 +34,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
@@ -365,7 +366,7 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2006-01-31 03:11:30
+--- orig/options.c     2006-02-03 23:51:57
 +++ options.c  2006-01-26 10:57:21
 @@ -144,6 +144,7 @@ char *backup_suffix = NULL;
  char *tmpdir = NULL;
@@ -519,17 +520,17 @@ the file's name.
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
---- orig/rsync.c       2006-01-31 02:30:18
+--- orig/rsync.c       2006-02-05 15:31:49
 +++ rsync.c    2006-01-30 07:19:44
-@@ -40,6 +40,7 @@ extern int inplace;
+@@ -49,6 +49,7 @@ extern int inplace;
  extern int keep_dirlinks;
  extern int make_backups;
  extern struct stats stats;
 +extern char *link_by_hash_dir;
  
- 
- /*
-@@ -213,8 +214,15 @@ void finish_transfer(char *fname, char *
+ #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+ iconv_t ic_chck = (iconv_t)-1;
+@@ -257,8 +258,15 @@ void finish_transfer(char *fname, char *
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
@@ -547,7 +548,7 @@ the file's name.
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                        ret == -2 ? "copy" : "rename",
---- orig/rsync.h       2006-01-30 20:39:09
+--- orig/rsync.h       2006-02-03 20:00:36
 +++ rsync.h    2006-01-30 20:42:44
 @@ -640,6 +640,14 @@ struct stats {
        int current_file_index;
@@ -564,7 +565,7 @@ the file's name.
  struct chmod_mode_struct;
  
  #include "byteorder.h"
---- orig/rsync.yo      2006-01-31 03:05:44
+--- orig/rsync.yo      2006-02-05 15:31:49
 +++ rsync.yo   2005-02-13 06:58:47
 @@ -361,6 +361,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR