Fixed problem with smartd not getting the correct path to the config file

from the --prefix option to configure. Thanks GG.

Also, make clean now removes the man pages (generated from *.in) files.


git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1511 4ea69e1a-61f1-4043-bf83-b5c94c648137

sm5/CHANGELOG

 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.343 2004/02/20 16:10:27 ballen4705 Exp $
+$Id: CHANGELOG,v 1.344 2004/02/23 20:32:10 ballen4705 Exp $
 
 The most recent version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
@@ -25,6 +25,12 @@ Maintainers / Developers Key:
 NOTES FOR FUTURE RELEASES: see TODO file.
 
 <ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
+  [BA] smartd: configure script did not set correct directory to search for
+       smartd.conf based on --prefix argument to ./configure.  Thanks to
+       GG for identifying the problem and fix.
+
+  [BA] make clean now removes man pages (generated from *.in) files as well
+       as object files.
 
   [EM] Correct copying of sense data in FreeBSD SCSI implementation. Thanks
        to Sergey Svishchev for noticing the bug.

sm5/Makefile.am

 ## Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.49 2004/02/12 18:30:30 card_captor Exp $
+# $Id: Makefile.am,v 1.50 2004/02/23 20:32:12 ballen4705 Exp $
 #
 
 @SET_MAKE@
 
 AUTOMAKE_OPTIONS = 1.6
 
+AM_CPPFLAGS = -DSMARTMONTOOLS_SYSCONFDIR=\"$(sysconfdir)\"
+
 sbin_PROGRAMS = smartd 	\
 		smartctl
 
@@ -160,7 +162,7 @@ EXTRA_DIST = \
 		autogen.sh		\
                 $(docs_DATA)
 
-DISTCLEANFILES = smartd.conf.5 \
+CLEANFILES = smartd.conf.5 \
                  smartd.conf.4 \
                  smartd.8      \
                  smartd.1m     \

sm5/NEWS

 smartmontools NEWS
 ------------------
-CVS ID: $Id: NEWS,v 1.16 2004/02/12 20:33:34 ballen4705 Exp $
+CVS ID: $Id: NEWS,v 1.17 2004/02/23 20:32:12 ballen4705 Exp $
 
 The most up-to-date version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/NEWS?sortby=date&view=markup
@@ -9,6 +9,9 @@ http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/NEWS?sortby=date&view=ma
 Date: 
 Summary: smartmontools release 5.27
 -----------------------------------
+- WARNING: this release has a broken --prefix=/a/path option to the
+  configure script.  The consequence is that smartd will not look for the
+  configuration file (smartd.conf) at the desired location.
 - NetBSD support added
 - A new Directive (-s) for smartd.conf now enables flexible automatic
   scheduled self-testing for both ATA and SCSI devices.

sm5/TODO

 TODO list for smartmontools:
 
-$Id: TODO,v 1.46 2003/12/16 05:16:08 ballen4705 Exp $
+$Id: TODO,v 1.47 2004/02/23 20:32:12 ballen4705 Exp $
 
 SATA devices
 ------------
@@ -80,12 +80,6 @@ Add command line option that scans devices then WRITES
 /etc/smartd.conf, perhaps as /etc/smartd.conf.output, just for devices
 that can be monitored.
 
-Solaris
--------
-Try and integrate ATA support.  See
-http://card-captor.dyndns.org/pub/solaris-smart/ for smartmontools
-5.1-18 patched with solaris ATA support (Keiji).
-
 FreeBSD
 -------
 Get interface for 3ware Escalade controllers working (Eduard).
@@ -93,28 +87,6 @@ Modify smartctl -h examples
 
 Packaging
 ---------
-The 'make dist' tarball currently contains these files:
-  examplescripts/Makefile.am
-  Makefile.am
-  configure.in
-  smartd.initd
-  smartd.8
-  smartd.conf.5
-  smartctl.8
-that shouldn't be there.  Note: if the .am files and configure.in
-files are included, then we should also include autogen.sh.
-
-In addition, 'make clean' should remove:  
-  smartd.8
-  smartd.conf.5
-  smartctl.8
-  smartd.initd
-since these are made from the corresponding .in files. But it doesn't
-remove them.
-
 Under freebsd and solaris, the following are wrong:
 smartd.conf: has linux device paths
 smart*.in  : man pages have (mostly) linux device paths
-
-Under freebsd the following is still wrong:
-smartctl   : examples have linux device paths

sm5/configure.in

 #
-# $Id: configure.in,v 1.56 2004/02/13 17:29:09 ballen4705 Exp $
+# $Id: configure.in,v 1.57 2004/02/23 20:32:12 ballen4705 Exp $
 #
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.50)
@@ -7,7 +7,7 @@ AC_INIT(smartmontools, 5.28, smartmontools-support@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(smartctl.c)
 
 smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
-smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.56 2004/02/13 17:29:09 ballen4705 Exp $'`
+smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.57 2004/02/23 20:32:12 ballen4705 Exp $'`
 smartmontools_release_date=2004/02/12
 smartmontools_release_time="23:33:10 UTC"
 
@@ -139,7 +139,6 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(SMARTMONTOOLS_BUILD_HOST,     "${host}",                       [smartmontools Build Host])
-AC_DEFINE_UNQUOTED(SMARTMONTOOLS_SYSCONFDIR,     "${sysconfdir}",                 [smartmontools System Configuration Directory])
 
 AC_SUBST(CFLAGS)