X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ce2ac5ac3ff1f4e3a14eb9b316de6804ca747181..0b76cd63ee0eacb95285dfb5d2cac2992e1794ef:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d144944b..f8ed5464 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,36 +1,43 @@
 # Makefile for rsync. This is processed by configure to produce the final
 # Makefile
 
-INSTALL_BIN=@prefix@/bin
-INSTALL_MAN=@prefix@/man
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+INSTALL_BIN=$(exec_prefix)/bin
+INSTALL_MAN=$(prefix)/man
 
 LIBS=@LIBS@
-CC=@CC@ 
+CC=@CC@
 CFLAGS=@CFLAGS@
- 
+
 INSTALLCMD=@INSTALL@
 
-SRC=@srcdir@
+VPATH=@srcdir@
+srcdir=@srcdir@
 SHELL=/bin/sh
 
 
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-LIBOBJ=lib/getopt.o lib/fnmatch.o lib/zlib.o
-OBJS1=rsync.o exclude.o util.o md4.o main.o checksum.o match.o 
-OBJS=$(OBJS1) flist.o io.o compat.o hlink.o token.o $(LIBOBJ)
+LIBOBJ=lib/getopt.o lib/fnmatch.o lib/zlib.o lib/compat.o
+OBJS1=rsync.o exclude.o util.o md4.o main.o checksum.o match.o syscall.o log.o
+DAEMON_OBJ = params.o loadparm.o 
+OBJS=$(OBJS1) $(DAEMON_OBJ) flist.o io.o compat.o hlink.o token.o uidlist.o socket.o $(LIBOBJ)
 
+# note that the -I. is needed to handle config.h when using VPATH
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c -o $*.o
+	$(CC) -I. -I$(srcdir) $(CFLAGS) -c $< -o $@
 
 all: rsync
 
 install: all
+	-mkdir -p ${INSTALL_BIN}
 	${INSTALLCMD} -m 755 rsync ${INSTALL_BIN}
-	${INSTALLCMD} -m 644 rsync.1 ${INSTALL_MAN}/man1
+	-mkdir -p ${INSTALL_MAN}/man1
+	${INSTALLCMD} -m 644 $(srcdir)/rsync.1 ${INSTALL_MAN}/man1
 
-rsync: $(OBJS) 
+rsync: $(OBJS)
 	$(CC) $(CFLAGS) -o rsync $(OBJS) $(LIBS)
 
 proto:
@@ -39,7 +46,7 @@ proto:
 clean:
 	rm -f *~ $(OBJS) rsync config.cache config.log config.status
 
-dist: 
+dist:
 	tar --exclude-from .ignore -czf dist.tar.gz .
 	-mkdir rsync-$(VERSION)
 	(cd rsync-$(VERSION) ; tar xzf ../dist.tar.gz)