(test_root): Append / to ROOT_FS unless it already ends in it.

[chaz/tar] / scripts / Makefile.am

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index dc8cfda88495cbcf3d6c41fb7e2510957cedb2cc..8d0470d1ddc2e3d4422b7b4048bef401ff3871cc 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -15,24 +15,35 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-libexec_SCRIPTS=backup.sh dump-remind
+BACKUP_LIBEXEC_SCRIPTS_LIST=backup.sh dump-remind
+BACKUP_SBIN_SCRIPTS_LIST=backup restore
+libexec_SCRIPTS=@BACKUP_LIBEXEC_SCRIPTS@
 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_SBIN_SCRIPTS@
+EXTRA_SCRIPTS=
+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