Hi all,

While preparing new debian packages for ganglia 3.0.0 I've come across a
small bug in the distclean target. If you specify --with-gmetad when you
./configre the DIST_SUBDIRS variable ends up including the gmetad
directory twice. The main pproblem this causes is that a make distclean 
will generate an error due to the gmetad/Makefile being missing the 
second time the make descends into gmetad/. 

This doesn't affect the "success" of the cleanup, as the directory's
already been cleared, but it does break the automated cleanup that the 
package build script requires to ensure a clean target.

To this end I've altered the master Makefile.am to ensure that the 
gmetad directory is included once and  once only. My patch is attached 
if you're interested in sorting upstream out.

Stu

-- 
|  Stuart Teasdale      | Atmospheric, Oceanic and Planetary Physics   |
|  System Manager       | University of Oxford                         |
|  "You don't need a weatherman to know which way the wind blows"      |



--- ganglia-3.0.0.orig/Makefile.am      2005-02-02 18:24:14.000000000 +0000
+++ ganglia-3.0.0/Makefile.am   2005-02-20 19:54:44.000000000 +0000
@@ -6,16 +6,18 @@
 GMETAD_SUBDIR = 
 endif
 
-GANGLIA_SUBDIRS = lib tests $(GMETAD_SUBDIR) gmond gmetric
+GANGLIA_SUBDIRS_TMP = lib tests gmond gmetric
+GANGLIA_SUBDIRS = $(GANGLIA_SUBDIRS_TMP) $(GMETAD_SUBDIR)
 
 AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-shar dist-zip
 
+# Make sure that no matter the setting for --with-gmetad
+# that the gmetad directory gets distributed
+DIST_SUBDIRS = $(GANGLIA_SUBDIRS_TMP) gmetad
+
 # Make sure we run the srclib but don't distribute it.  That
 # is handled in the "dist-hook" below...
 SUBDIRS = srclib $(GANGLIA_SUBDIRS)
-# Make sure that no matter the setting for --with-gmetad
-# that the gmetad directory gets distributed
-DIST_SUBDIRS = $(GANGLIA_SUBDIRS) gmetad
 
 EXTRA_DIST = config ganglia.spec ganglia.pod ganglia.html mans
 

Reply via email to