From afd147914d8e66f2505d37109477ac0a95b56af7 Mon Sep 17 00:00:00 2001 From: Sebastien Godard Date: Sat, 6 Nov 2010 16:06:44 +0100 Subject: [PATCH] Moved cron files in a separate cron subdirectory. --- CHANGES | 1 + Makefile.in | 18 +++++++-------- configure | 22 +++++++++---------- configure.in | 10 ++++----- crontab.sample => cron/crontab.sample | 0 .../sysstat.cron.daily.in | 0 .../sysstat.cron.hourly.in | 0 sysstat.crond.in => cron/sysstat.crond.in | 0 8 files changed, 26 insertions(+), 25 deletions(-) rename crontab.sample => cron/crontab.sample (100%) rename sysstat.cron.daily.in => cron/sysstat.cron.daily.in (100%) rename sysstat.cron.hourly.in => cron/sysstat.cron.hourly.in (100%) rename sysstat.crond.in => cron/sysstat.crond.in (100%) diff --git a/CHANGES b/CHANGES index 3195f86..ea82ec8 100644 --- a/CHANGES +++ b/CHANGES @@ -22,6 +22,7 @@ xxxx/xx/xx: Version 9.1.6 - Sebastien Godard (sysstat orange.fr) * sar manual page updated. * DTD and XSD documents updated. * Split up prf_stats.c file into rndr_stats.c and xml_stats.c + * Moved cron files in a separate cron subdirectory. * Made sysstat git aware. * CREDITS file updated. diff --git a/Makefile.in b/Makefile.in index bfa3a5a..a3f3c28 100644 --- a/Makefile.in +++ b/Makefile.in @@ -368,19 +368,19 @@ ifeq ($(INSTALL_DOC),y) $(INSTALL_DATA) *.lsm $(DESTDIR)$(DOC_DIR) endif -install_all: install_base crontab sysstat \ - sysstat.crond sysstat.cron.daily sysstat.cron.hourly +install_all: install_base cron/crontab sysstat \ + cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR) if [ -d $(DESTDIR)/etc/cron.d ]; then \ - $(INSTALL_DATA) sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ + $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ - $(INSTALL_BIN) sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \ - $(INSTALL_BIN) sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \ + $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \ + $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \ else \ su $(CRON_OWNER) -c "crontab -l > /tmp/crontab-$(CRON_OWNER).save"; \ $(CP) -a /tmp/crontab-$(CRON_OWNER).save ./crontab-$(CRON_OWNER).`date '+%Y%m%d.%H%M%S'`.save; \ echo "USER'S PREVIOUS CRONTAB SAVED IN CURRENT DIRECTORY (USING .save SUFFIX)."; \ - su $(CRON_OWNER) -c "crontab crontab"; \ + su $(CRON_OWNER) -c "crontab cron/crontab"; \ fi if [ -d $(DESTDIR)$(INIT_DIR) ]; then \ $(INSTALL_BIN) sysstat $(DESTDIR)$(INIT_DIR)/sysstat; \ @@ -579,9 +579,9 @@ clean: find nls -name "*.gmo" -exec rm -f {} \; almost-distclean: clean nls/sysstat.pot - rm -f sa1 sa2 sysstat crontab version.h sysconfig.h - rm -f sysstat.sysconfig sysstat.crond sysstat.cron.daily - rm -f sysstat.cron.hourly sysstat.crond.sample sysstat.crond.sample.in + rm -f sa1 sa2 sysstat cron/crontab version.h sysconfig.h + rm -f sysstat.sysconfig cron/sysstat.crond cron/sysstat.cron.daily + rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in rm -f contrib/isag/isag rm -f man/sa1.8 man/sa2.8 man/sadc.8 man/sadf.1 man/sar.1 man/iostat.1 man/sysstat.5 rm -f *.log config.status diff --git a/configure b/configure index 231a4d5..a754c0d 100755 --- a/configure +++ b/configure @@ -7758,7 +7758,7 @@ ac_config_files="$ac_config_files sa1" # Permissions must be changed ac_config_files="$ac_config_files sa2" # Permissions must be changed -ac_config_files="$ac_config_files crontab:crontab.sample" +ac_config_files="$ac_config_files cron/crontab:cron/crontab.sample" # File must be renamed ac_config_files="$ac_config_files sysstat.sysconfig" @@ -7766,13 +7766,13 @@ ac_config_files="$ac_config_files version.h:version.in" # File must be renamed ac_config_files="$ac_config_files sysconfig.h:sysconfig.in" # File must be renamed -ac_config_files="$ac_config_files sysstat.cron.daily" +ac_config_files="$ac_config_files cron/sysstat.cron.daily" -ac_config_files="$ac_config_files sysstat.cron.hourly" +ac_config_files="$ac_config_files cron/sysstat.cron.hourly" -ac_config_files="$ac_config_files sysstat.crond" +ac_config_files="$ac_config_files cron/sysstat.crond" -ac_config_files="$ac_config_files sysstat.crond.sample.in:sysstat.crond.in" +ac_config_files="$ac_config_files cron/sysstat.crond.sample.in:cron/sysstat.crond.in" ac_config_files="$ac_config_files sysstat" # Permissions must be changed @@ -8405,14 +8405,14 @@ do case $ac_config_target in "sa1") CONFIG_FILES="$CONFIG_FILES sa1" ;; "sa2") CONFIG_FILES="$CONFIG_FILES sa2" ;; - "crontab") CONFIG_FILES="$CONFIG_FILES crontab:crontab.sample" ;; + "cron/crontab") CONFIG_FILES="$CONFIG_FILES cron/crontab:cron/crontab.sample" ;; "sysstat.sysconfig") CONFIG_FILES="$CONFIG_FILES sysstat.sysconfig" ;; "version.h") CONFIG_FILES="$CONFIG_FILES version.h:version.in" ;; "sysconfig.h") CONFIG_FILES="$CONFIG_FILES sysconfig.h:sysconfig.in" ;; - "sysstat.cron.daily") CONFIG_FILES="$CONFIG_FILES sysstat.cron.daily" ;; - "sysstat.cron.hourly") CONFIG_FILES="$CONFIG_FILES sysstat.cron.hourly" ;; - "sysstat.crond") CONFIG_FILES="$CONFIG_FILES sysstat.crond" ;; - "sysstat.crond.sample.in") CONFIG_FILES="$CONFIG_FILES sysstat.crond.sample.in:sysstat.crond.in" ;; + "cron/sysstat.cron.daily") CONFIG_FILES="$CONFIG_FILES cron/sysstat.cron.daily" ;; + "cron/sysstat.cron.hourly") CONFIG_FILES="$CONFIG_FILES cron/sysstat.cron.hourly" ;; + "cron/sysstat.crond") CONFIG_FILES="$CONFIG_FILES cron/sysstat.crond" ;; + "cron/sysstat.crond.sample.in") CONFIG_FILES="$CONFIG_FILES cron/sysstat.crond.sample.in:cron/sysstat.crond.in" ;; "sysstat") CONFIG_FILES="$CONFIG_FILES sysstat" ;; "man/sa1.8") CONFIG_FILES="$CONFIG_FILES man/sa1.8:man/sa1.in" ;; "man/sa2.8") CONFIG_FILES="$CONFIG_FILES man/sa2.8:man/sa2.in" ;; @@ -8889,7 +8889,7 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;} case $ac_file$ac_mode in "sa1":F) chmod +x sa1 ;; "sa2":F) chmod +x sa2 ;; - "sysstat.crond.sample.in":F) sed s/^/#/ sysstat.crond.sample.in > sysstat.crond.sample ;; + "cron/sysstat.crond.sample.in":F) sed s/^/#/ cron/sysstat.crond.sample.in > cron/sysstat.crond.sample ;; "sysstat":F) chmod +x sysstat ;; "contrib/isag/isag":F) chmod +x contrib/isag/isag ;; diff --git a/configure.in b/configure.in index cc60a47..8baefe3 100644 --- a/configure.in +++ b/configure.in @@ -492,14 +492,14 @@ echo Now create files: echo . AC_CONFIG_FILES([sa1], [chmod +x sa1]) # Permissions must be changed AC_CONFIG_FILES([sa2], [chmod +x sa2]) # Permissions must be changed -AC_CONFIG_FILES([crontab:crontab.sample]) # File must be renamed +AC_CONFIG_FILES([cron/crontab:cron/crontab.sample]) # File must be renamed AC_CONFIG_FILES([sysstat.sysconfig]) AC_CONFIG_FILES([version.h:version.in]) # File must be renamed AC_CONFIG_FILES([sysconfig.h:sysconfig.in]) # File must be renamed -AC_CONFIG_FILES([sysstat.cron.daily]) -AC_CONFIG_FILES([sysstat.cron.hourly]) -AC_CONFIG_FILES([sysstat.crond]) -AC_CONFIG_FILES([sysstat.crond.sample.in:sysstat.crond.in], [sed s/^/#/ sysstat.crond.sample.in > sysstat.crond.sample]) +AC_CONFIG_FILES([cron/sysstat.cron.daily]) +AC_CONFIG_FILES([cron/sysstat.cron.hourly]) +AC_CONFIG_FILES([cron/sysstat.crond]) +AC_CONFIG_FILES([cron/sysstat.crond.sample.in:cron/sysstat.crond.in], [sed s/^/#/ cron/sysstat.crond.sample.in > cron/sysstat.crond.sample]) AC_CONFIG_FILES([sysstat], [chmod +x sysstat]) # Permissions must be changed AC_CONFIG_FILES([man/sa1.8:man/sa1.in]) # File must be renamed AC_CONFIG_FILES([man/sa2.8:man/sa2.in]) # File must be renamed diff --git a/crontab.sample b/cron/crontab.sample similarity index 100% rename from crontab.sample rename to cron/crontab.sample diff --git a/sysstat.cron.daily.in b/cron/sysstat.cron.daily.in similarity index 100% rename from sysstat.cron.daily.in rename to cron/sysstat.cron.daily.in diff --git a/sysstat.cron.hourly.in b/cron/sysstat.cron.hourly.in similarity index 100% rename from sysstat.cron.hourly.in rename to cron/sysstat.cron.hourly.in diff --git a/sysstat.crond.in b/cron/sysstat.crond.in similarity index 100% rename from sysstat.crond.in rename to cron/sysstat.crond.in -- 2.50.0