Fix of autotools stuff for anacron.

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

diff --git a/.gitignore b/.gitignore
index a5e7af3ac709f709eab3c1f3b5af2908a90f2160..8362b887ad48929a65d48d2075f6208dce2ccaf9 100644 (file)
--- 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 137c6c83a0e5683ac0618e242b0a20883df56579..6cf2ee2abd5d6837efbccd734e98630c25b67f3c 100644 (file)
--- 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 a79cd75af9e25f1f50f6a744f8c65a8991a2dd01..88e0be2d71123020346c7c0bbf37ebb425d4cbd3 100644 (file)
--- 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 6a37843de6d15299d2ea0fe2ee09801ad0b0a2a7..fa643007c507332c578ee2e6fdc7b66948a32b73 100644 (file)
--- 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@:>@])