From: Štěpán Kasal <kasal AT redhat DOT com>
Date: Fri, 17 Jul 2009 10:13:28 +0000 (+0200)
Subject: Fix of autotools stuff for anacron.
X-Git-Tag: cronie1.4~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e24881c3b8756aa5f3cc0f6d2cf59126549eb7a1;p=cronie

Fix of autotools stuff for anacron.

Signed-off-by: Marcela Mašláňová <mmaslano@redhat.com>
---

diff --git a/.gitignore b/.gitignore
index a5e7af3..8362b88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 Makefile.in
 Makefile
+anacron/anacron
+anacron/anacron-paths.h
 anacron/Makefile
 anacron/Makefile.in
 aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 137c6c8..6cf2ee2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,12 @@
-SUBDIRS = src man anacron
+SUBDIRS = src man
+if ANACRON
+	SUBDIRS += anacron
+endif
 
 if PAM
 pamdir = $(sysconfdir)/pam.d
 dist_pam_DATA = pam/crond
 endif
 
-EXTRA_DIST = cronie.init crond.sysconfig contrib/regularly-jobs
-
-if ANACRON
-	SUBDIRS += anacron
-	EXTRA_DIST += contrib/0anacron contrib/0hourly
-endif
+EXTRA_DIST = cronie.init crond.sysconfig contrib/regularly-jobs \
+			contrib/0anacron contrib/0hourly
diff --git a/anacron/Makefile.am b/anacron/Makefile.am
index a79cd75..88e0be2 100644
--- a/anacron/Makefile.am
+++ b/anacron/Makefile.am
@@ -1,5 +1,4 @@
 # Makefile.am - two binaries crond and crontab
-if ANACRON
 sbin_PROGRAMS = anacron
 
 anacron_SOURCES = \
@@ -27,4 +26,3 @@ anacron-paths.h: Makefile
 	#define ANACRONTAB "$(ANACRONTAB)" \
 	#endif /* _ANACRON_PATHS_H_ */ \
 	END
-endif
diff --git a/configure.ac b/configure.ac
index 6a37843..fa64300 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ AC_ARG_WITH(audit,
         fi ]
 )
 
-dnl CRON_VAR_DEFAULT (VAR, DESCRIPTION, DEFAULT)
+dnl CRONIE_VAR_DEFAULT (VAR, DESCRIPTION, DEFAULT)
 dnl --------------------------------------------
 AC_DEFUN([CRONIE_CONF_VAR],
 [AC_ARG_VAR([$1], [$2 @<:@$3@:>@])