remove stale stamps config option

This commit is contained in:
Konstantin Stepanov 2015-08-05 14:59:38 +03:00
parent 954b3b25be
commit 00e6b10814
3 changed files with 3 additions and 15 deletions

View File

@ -15,7 +15,6 @@ docdir := @docdir@
unitdir := @unitdir@
runparts := @runparts@
stale_stamps := @stale_stamps@
srcdir := $(CURDIR)/src
outdir := $(CURDIR)/out
@ -75,15 +74,13 @@ build: all
target/release/build/systemd-crontab-generator-*/out/*.timer \
target/release/build/systemd-crontab-generator-*/out/*.path \
$(builddir)/units/
cp -a target/release/build/systemd-crontab-generator-*/out/*.1 \
target/release/build/systemd-crontab-generator-*/out/*.5 \
target/release/build/systemd-crontab-generator-*/out/*.7 \
cp -a target/release/build/systemd-crontab-generator-*/out/*.[1578] \
$(builddir)/man/
install: build
install -m2755 -g `getent group cron || echo root` -s -D $(builddir)/bin/crontab $(DESTDIR)$(bindir)/crontab
install -m755 -s -D $(builddir)/bin/systemd-crontab-generator $(DESTDIR)$(libdir)/systemd/system-generators/systemd-crontab-generator
install -m755 -s -D $(builddir)/bin/remove-stale-stamps $(DESTDIR)$(stale_stamps)
install -m755 -s -D $(builddir)/bin/remove-stale-stamps $(DESTDIR)$(libdir)/$(package)/remove-stale-stamps
install -m755 -s -D $(builddir)/bin/mail-on-failure $(DESTDIR)$(libdir)/$(package)/mail-on-failure
install -m755 -s -D $(builddir)/bin/boot-delay $(DESTDIR)$(libdir)/$(package)/boot-delay
@ -108,7 +105,7 @@ install: build
uninstall:
rm -f $(DESTDIR)$(bindir)/crontab
rm -f $(DESTDIR)$(libdir)/systemd/system-generators/systemd-crontab-generator
rm -f $(DESTDIR)$(stale_stamps)
rm -f $(DESTDIR)$(libdir)/$(package)/remove-stale-stamps
rm -f $(DESTDIR)$(libdir)/$(package)/mail-on-failure
rm -f $(DESTDIR)$(libdir)/$(package)/boot-delay

View File

@ -67,8 +67,6 @@ fn build_render_data() -> BTreeMap<String, Json> {
ctx.insert("docdir".to_owned(), Json::String(env::var("DOC_DIR").unwrap_or_else(|_| datadir.clone() + "/doc/" + package)));
ctx.insert("unitdir".to_owned(), Json::String(env::var("UNIT_DIR").unwrap_or_else(|_| libdir.clone() + "/systemd/system")));
ctx.insert("stale_stamps".to_owned(), Json::String(env::var("STALE_STAMPS").unwrap_or_else(|_| libdir.clone() + "/" + package + "/remove-stale-stamps")));
ctx.insert("libdir".to_owned(), Json::String(libdir));
ctx.insert("datadir".to_owned(), Json::String(datadir));
ctx.insert("prefix".to_owned(), Json::String(prefix));

7
configure vendored
View File

@ -23,7 +23,6 @@ enable_yearly=no
# systemd ≥ 212
enable_persistent=no
stale_stamps='$(libdir)/$(package)/remove-stale-stamps'
# systemd ≥ 217
enable_minutely=no
@ -41,7 +40,6 @@ mandir:,
docdir:,
unitdir:,
runparts:,
stale-stamps:,
enable-boot::,
enable-minutely::,
enable-hourly::,
@ -113,10 +111,6 @@ do
runparts="${2}"
shift 2;;
'--stale-stamps')
stale_stamps="${2}"
shift 2;;
'--enable-boot')
set_enable_flag boot ${2}
shift 2;;
@ -225,6 +219,5 @@ s|@mandir@|${mandir}|g
s|@docdir@|${docdir}|g
s|@unitdir@|${unitdir}|g
s|@runparts@|${runparts}|g
s|@stale_stamps@|${stale_stamps}|g
" Makefile.in >> Makefile