From 5d26a7fb5e9c04fed902f6e92e5a77bd30935255 Mon Sep 17 00:00:00 2001 From: Konstantin Stepanov Date: Thu, 10 Dec 2015 21:16:12 +0300 Subject: [PATCH] update makefile --- Makefile.in | 16 +++++----------- README.md | 6 ++++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3b67f2d..4029627 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,7 +29,7 @@ out_targets := $(foreach schedule,$(schedules),$(builddir)/units/cron-$(schedul out_units := $(out_services) $(out_timers) $(out_targets) $(builddir)/units/cron.target \ $(builddir)/units/cron-update.path $(builddir)/units/cron-update.service \ $(builddir)/units/cron-failure@.service -out_manuals := $(patsubst $(srcdir)/man/%.in,$(builddir)/man/%,$(wildcard $(srcdir)/man/*)) +out_manuals := $(patsubst $(CURDIR)/man/%.in,$(builddir)/man/%,$(wildcard $(CURDIR)/man/*)) out_programs := $(patsubst $(srcdir)/bin/%.rs,$(builddir)/bin/%,$(wildcard $(srcdir)/bin/*.rs)) outputs := $(out_units) $(out_manuals) $(out_programs) @@ -39,21 +39,15 @@ define \n endef null := -requires = $(subst ${null} ${null},\n,$(foreach schedule,$(schedules),Requires=cron-$(schedule).timer)) -persistent = $(if $(filter $(enable_persistent),yes),True,False) +persistent = $(if $(filter $(enable_persistent),yes),persistent,) all: $(builddir) $(outputs) clean: - rm -rf $(outdir) $(builddir) + rm -rf $(outdir) distprep: $(distdir) - cp -a configure $(distdir) - cp -a Makefile.in $(distdir) - cp -a LICENSE $(distdir) - cp -a README.md $(distdir) - cp -a VERSION $(distdir) - cp -a src $(distdir) + cp -a configure Makefile.in LICENSE README.md VERSION src man units $(distdir) dist: $(tarball) @@ -63,7 +57,7 @@ test: all cargo test build: all - cargo install --path . --root $(builddir) + cargo install --path $(CURDIR) --root $(builddir) --features "$(schedules) $(persistent)" install: build install -m2755 -g `getent group cron || echo root` -s -D $(builddir)/bin/crontab $(DESTDIR)$(bindir)/crontab diff --git a/README.md b/README.md index 48f72af..30321fc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -systemd-cron-next [![Travis](https://img.shields.io/travis/systemd-cron/systemd-cron-next.svg)](https://travis-ci.org/systemd-cron/systemd-cron-next) -========================= +systemd-cron-next +================= + +[![Travis](https://img.shields.io/travis/systemd-cron/systemd-cron-next.svg)](https://travis-ci.org/systemd-cron/systemd-cron-next) ## What's it?