diff options
| author | intrigeri <intrigeri@boum.org> | 2012-05-15 17:55:51 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-05-15 17:55:51 +0200 |
| commit | ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf (patch) | |
| tree | 392f8d082fb3fc26e1ea30c483c0e19a90f5f7f7 /handlers/Makefile.am | |
| parent | 1b2dc55cb82d790eca8ea1c2b325a755db75a91a (diff) | |
| parent | 13edaf0912f8b36d5035b5ebdbbc28fd0d498427 (diff) | |
| download | backupninja-ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf.tar.gz backupninja-ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf.tar.bz2 | |
Merge tag 'backupninja_upstream/1.0_rc1' into debian
Upstream version 1.0~rc1
Conflicts:
Makefile.in
aclocal.m4
configure
etc/Makefile.in
examples/Makefile.in
handlers/Makefile.in
install-sh
lib/Makefile.in
man/Makefile.in
missing
src/Makefile.in
Diffstat (limited to 'handlers/Makefile.am')
| -rw-r--r-- | handlers/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/handlers/Makefile.am b/handlers/Makefile.am index 54155e8..bad53bb 100644 --- a/handlers/Makefile.am +++ b/handlers/Makefile.am @@ -3,16 +3,20 @@ HANDLERS = dup dup.helper maildir makecd \ makecd.helper mysql mysql.helper pgsql pgsql.helper rdiff \ rdiff.helper rsync sh svn sys sys.helper trac tar tar.helper +DIST_HANDLERS = dup.in dup.helper.in maildir.in makecd.in \ + makecd.helper.in mysql.in mysql.helper.in pgsql.in pgsql.helper.in rdiff.in \ + rdiff.helper.in rsync.in sh.in svn.in sys.in sys.helper.in trac.in tar.in tar.helper.in wget + CLEANFILES = $(HANDLERS) -EXTRA_DIST = Makefile.am $(HANDLERS) +EXTRA_DIST = Makefile.am $(DIST_HANDLERS) edit = sed \ -e "s,@BASH\@,$(BASH),g" \ -e "s,@AWK\@,$(AWK),g" \ -e "s,@SED\@,$(SED),g" -dist_pkgdata_DATA = $(HANDLERS) +pkgdata_DATA = $(HANDLERS) dup: $(srcdir)/dup.in rm -f dup |