Add --delete option to rsync to remove obsolete files from WWWROOT.

diff --git a/Makefile b/Makefile
index a1cc6ac..973e46a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,9 @@ roff: stamp/www-roff-modified
 
 stamp/www-roff-modified: stamp/cvs-status-modified
        @mkdir -p $(WWWROFF)
-       $(RSYNC) -a $(ROFFSRC)/ $(WWWROFF)
+       $(RSYNC) -a --delete -v $(ROFFSRC)/ $(WWWROFF)
        @mkdir -p $(WWWPOD)
-       $(RSYNC) -a $(PODSRC)/ $(WWWPOD)
+       $(RSYNC) -a --delete -v $(PODSRC)/ $(WWWPOD)
        touch $@
 
 #

diff --git a/Makefile.dist b/Makefile.dist
index 0e9317d..b081797 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -23,7 +23,7 @@ $(INSTALL): $(INSTALL).in
 install: all
        mkdir -p $(TMPDIR)/$(DIST)
        if [ -x $(RSYNC) ]; then \
-           $(RSYNC) -v -a \
+           $(RSYNC) -a --delete -v \
            --exclude='*CVS*' \
            --exclude='*.in' \
            --exclude='.cvsignore' \

diff --git a/admin/site/Makefile b/admin/site/Makefile
index 6bba8ee..904deef 100644 (file)
--- a/admin/site/Makefile
+++ b/admin/site/Makefile
@@ -10,4 +10,4 @@ $(SITEMAP):    ../../stamp/www-html-modified
        ./gen_sitemap.rb $(WWWROOT) > $(SITEMAP)
 
 install: $(SITEMAP)
-       $(RSYNC) -a -v $(CONTENTS) $(WWWROOT)
+       $(RSYNC) -a --delete -v $(CONTENTS) $(WWWROOT)

diff --git a/www/Makefile b/www/Makefile
index f024354..b8d3628 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -61,12 +61,13 @@ clean:
 
 install: all
        $(MAKE) -C guidance  WWWROOT=$(WWWROOT) install
-       $(RSYNC) -a -v \
+       $(RSYNC) -a --delete -v \
        --exclude='bin' \
        --exclude='*.m4' \
        --exclude='*.perl' \
        --exclude='*.list' \
        --exclude='Makefile' \
        --exclude='ChangeLog' \
+       --exclude='.gitignore' \
        * $(WWWROOT)
        $(MAKE) -C ../admin/site WWWROOT=$(WWWROOT) install