Updated

diff --git a/scripts/.cvsignore b/scripts/.cvsignore
index bdda04c753d488da4060b602ed4dc12c9298fbad..c8d103d2093b1f62823a11bc2d77471f3246a3fb 100644 (file)
--- a/scripts/.cvsignore
+++ b/scripts/.cvsignore
@@ -1,4 +1,6 @@
 Makefile.in
 Makefile
+backup.sh
 backup
+restore
 dump-remind

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index dc8cfda88495cbcf3d6c41fb7e2510957cedb2cc..4d43928bc40e0de24835a5264328bf0380cc8124 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -17,22 +17,30 @@
 
 libexec_SCRIPTS=backup.sh dump-remind
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=backup.sh dump-remind
-sbin_SCRIPTS=backup
-EXTRA_DIST=$(libexec_SCRIPTS) backup.in dump-remind.in backup-specs
-CLEANFILES=backup dump-remind
+sbin_SCRIPTS=backup restore
+EXTRA_DIST=\
+ backup.sh.in\
+ backup.in\
+ restore.in\
+ dump-remind.in\
+ backup-specs
+CLEANFILES=backup.sh backup restore dump-remind
+
+SED_CMD="s,\@libexecdir\@,$(libexecdir),;\
+         s,\@sysconfdir\@,$(sysconfdir),;\
+         s,\@PACKAGE\@,$(PACKAGE),;\
+         s,\@VERSION\@,$(VERSION),;\
+         s,\@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),;\
+         s,\@DATE_FORMAT_OK\@,$(DATE_FORMAT_OK),;@BACKUP_SED_COND@"
+
+backup.sh: $(srcdir)/backup.sh.in
+       sed $(SED_CMD) $? > $@
 
 backup: $(srcdir)/backup.in
-       sed "s,\@libexecdir\@,$(libexecdir),;\
-             s,\@sysconfdir\@,$(sysconfdir),;\
-             s,\@PACKAGE\@,$(PACKAGE),;\
-             s,\@VERSION\@,$(VERSION),;\
-             s,\@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),;\
-             s,\@DATE_FORMAT_OK\@,$(DATE_FORMAT_OK),;@BACKUP_SED_COND@" $? > $@
+       sed $(SED_CMD) $? > $@
+
+restore: $(srcdir)/restore.in
+       sed $(SED_CMD) $? > $@
 
 dump-remind: $(srcdir)/dump-remind.in
-       sed "s,\@libexecdir\@,$(libexecdir),;\
-             s,\@sysconfdir\@,$(sysconfdir),;\
-             s,\@PACKAGE\@,$(PACKAGE),;\
-             s,\@VERSION\@,$(VERSION),;\
-             s,\@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),;\
-             s,\@DATE_FORMAT_OK\@,$(DATE_FORMAT_OK),;@BACKUP_SED_COND@" $? > $@
\ No newline at end of file
+       sed $(SED_CMD) $? > $@
\ No newline at end of file

diff --git a/scripts/backup-specs b/scripts/backup-specs
index dd9cf5d351aba538badb7b9ec864d603238eb315..4f3d45654aa62fe2c009a7ee3168bf77daf1f092 100644 (file)
--- a/scripts/backup-specs
+++ b/scripts/backup-specs
@@ -50,6 +50,10 @@ BACKUP_FILES=''
 # this file may be overridden by setting FILELIST variable:
 # FILELIST=/etc/my-backup/filelist
 
+# Name of 'exclude file list'. It is searched under $SYSCONFDIR/tar-backup
+# on remote machines
+XLIST=exclude_files
+
 # Default directory for storing incremental listings on remote
 # machines is $SYSCONFDIR/tar-backup. It can be overridden using
 # REMOTEBACKUPDIR variable