X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e6d8e70925201ec87da5242eacf23c58b39d6ca2..deee574b1198a2886369f4ecbfbeaa6f851bb41d:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 62ecdb75..bd0a6e77 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,6 +2,7 @@
 # Makefile
 
 prefix=@prefix@
+datarootdir=@datarootdir@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 mandir=@mandir@
@@ -31,14 +32,14 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
 	zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
 OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
-	main.o checksum.o match.o syscall.o log.o backup.o
-OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
+	main.o checksum.o match.o syscall.o log.o backup.o options.o 
+OBJS2=flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
 	fileio.o batch.o clientname.o chmod.o
 OBJS3=progress.o pipe.o
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
 popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 	popt/popthelp.o popt/poptparse.o
-OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
+OBJS=$(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(OBJS1) $(ZLIBOBJ) @BUILD_POPT@
 
 TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
 
@@ -91,13 +92,13 @@ t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
 
 gen:
-	$(MAKE) -C $(srcdir) -f prepare-source.mak gen
+	cd $(srcdir) && $(MAKE) -f prepare-source.mak gen
 
 man:
-	$(MAKE) -C $(srcdir) -f prepare-source.mak man
+	cd $(srcdir) && $(MAKE) -f prepare-source.mak man
 
 proto:
-	$(MAKE) -C $(srcdir) -f prepare-source.mak proto.h
+	cd $(srcdir) && $(MAKE) -f prepare-source.mak proto.h
 
 clean: cleantests
 	rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS)
@@ -142,7 +143,7 @@ test: check
 # might lose in the future where POSIX diverges from old sh.
 
 check: all $(CHECK_PROGS)
-	POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/rsync$(EXEEXT) srcdir="$(srcdir)" $(srcdir)/runtests.sh
+	rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh
 
 wildtest.o: wildtest.c lib/wildmatch.c rsync.h
 wildtest$(EXEEXT): wildtest.o lib/compat.o