* Make "make install-strip" works properly, and "make install"

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3e5ca3e..c88a890 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,15 +53,15 @@ all: rsync
 man: rsync.1 rsyncd.conf.5
 
 install: all
-       -mkdir -p ${bindir}
-       ${INSTALLCMD} -m 755 rsync ${bindir}
-       -mkdir -p ${mandir}/man1
-       -mkdir -p ${mandir}/man5
-       ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
-       ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
+       -mkdir -p ${DESTDIR}${bindir}
+       ${INSTALLCMD} ${STRIP} -m 755 rsync ${DESTDIR}${bindir}
+       -mkdir -p ${DESTDIR}${mandir}/man1
+       -mkdir -p ${DESTDIR}${mandir}/man5
+       ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
+       ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5
 
 install-strip:
-       $(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install
+       $(MAKE) STRIP='-s' install
 
 rsync: $(OBJS)
        @echo "Please ignore warnings below about mktemp -- it is used in a safe way"
@@ -88,13 +88,21 @@ rsyncd.conf.5: rsyncd.conf.yo
 proto:
        cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h
 
-clean:
+clean: 
        rm -f *~ $(OBJS) rsync $(TLS_OBJ) tls
        rm -rf ./testtmp
-       rm -f config.cache 
 
+# We try to delete built files from both the source and build
+# directories, just in case somebody previously configured things in
+# the source directory.
 distclean: clean
-       rm -f Makefile config.h config.status
+       rm -f Makefile config.h config.status 
+       rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/config.status 
+
+       rm -f config.cache config.log
+       rm -f $(srcdir)/config.cache $(srcdir)/config.log
+
+       rm -f shconfig $(srcdir)/shconfig
 
 # this target is really just for my use. It only works on a limited
 # range of machines and is used to produce a list of potentially