To build ganglia-monitor-core-2.5.7 RPM package for Linux i386, x86_64 and
ia64 I have integrated this patch provided below.
summary:
* install init script in /etc/init.d instead of /etc/rc.d/init.d because
this path only exists on redhat based systems
* corrects syntax in acinclude.m4
* corrects syntax in aclocal.m4
* corrects syntax in Makefile.am
* changes in ganglia.spec* to build package from the scratch
- use of autoconf, automake fives the problem with /usr/lib64 on x86_64
- start services only if they run on upgrade
- catch libs depending on platform
* makes init.d scripts more distribution independed
With this complete patch it was no problem to build rpm packages.
best regards,
mike
diff -u -r -N ganglia-monitor-core-2.5.7.orig/README
ganglia-monitor-core-2.5.7/README
--- ganglia-monitor-core-2.5.7.orig/README 2004-10-12 22:51:48.000000000
+0200
+++ ganglia-monitor-core-2.5.7/README 2004-12-15 14:24:33.583271761 +0100
@@ -247,11 +247,11 @@
"gmetad" and "gmond" at system startup. They are easy to install from
the source root.
- % cp ./gmond/gmond.init /etc/rc.d/init.d/gmond
+ % cp ./gmond/gmond.init /etc/init.d/gmond
% chkconfig --add gmond
% chkconfig --list gmond
gmond 0:off 1:off 2:on 3:on 4:on 5:on
6:off
- % /etc/rc.d/init.d/gmond start
+ % /etc/init.d/gmond start
Starting GANGLIA gmond: [ OK ]
Repeat this step with gmetad.
diff -u -r -N ganglia-monitor-core-2.5.7.orig/acinclude.m4
ganglia-monitor-core-2.5.7/acinclude.m4
--- ganglia-monitor-core-2.5.7.orig/acinclude.m4 2002-08-20
01:38:23.000000000 +0200
+++ ganglia-monitor-core-2.5.7/acinclude.m4 2004-12-15 08:13:57.585338475
+0100
@@ -4,7 +4,7 @@
dnl usage: AC_DNET_LINUX_PROCFS
dnl results: HAVE_LINUX_PROCFS
dnl
-AC_DEFUN(AC_DNET_LINUX_PROCFS,
+AC_DEFUN([AC_DNET_LINUX_PROCFS],
[AC_MSG_CHECKING(for Linux proc filesystem)
AC_CACHE_VAL(ac_cv_dnet_linux_procfs,
if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then
@@ -24,7 +24,7 @@
dnl usage: AC_DNET_SOCKADDR_SA_LEN
dnl results: HAVE_SOCKADDR_SA_LEN (defined)
dnl
-AC_DEFUN(AC_DNET_SOCKADDR_SA_LEN,
+AC_DEFUN([AC_DNET_SOCKADDR_SA_LEN],
[AC_MSG_CHECKING(for sa_len in sockaddr struct)
AC_CACHE_VAL(ac_cv_dnet_sockaddr_has_sa_len,
AC_TRY_COMPILE([
@@ -47,7 +47,7 @@
dnl be included in the search
dnl
dnl
-AC_DEFUN(AC_SEARCH_TYPE,
+AC_DEFUN([AC_SEARCH_TYPE],
[AC_MSG_CHECKING(if $1 defined)
AC_CACHE_VAL(ac_cv_type_$1,
AC_TRY_COMPILE(
diff -u -r -N ganglia-monitor-core-2.5.7.orig/aclocal.m4
ganglia-monitor-core-2.5.7/aclocal.m4
--- ganglia-monitor-core-2.5.7.orig/aclocal.m4 2004-10-12 22:51:03.000000000
+0200
+++ ganglia-monitor-core-2.5.7/aclocal.m4 2004-12-15 08:18:58.583161655
+0100
@@ -17,7 +17,7 @@
dnl usage: AC_DNET_LINUX_PROCFS
dnl results: HAVE_LINUX_PROCFS
dnl
-AC_DEFUN(AC_DNET_LINUX_PROCFS,
+AC_DEFUN([AC_DNET_LINUX_PROCFS],
[AC_MSG_CHECKING(for Linux proc filesystem)
AC_CACHE_VAL(ac_cv_dnet_linux_procfs,
if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then
@@ -37,7 +37,7 @@
dnl usage: AC_DNET_SOCKADDR_SA_LEN
dnl results: HAVE_SOCKADDR_SA_LEN (defined)
dnl
-AC_DEFUN(AC_DNET_SOCKADDR_SA_LEN,
+AC_DEFUN([AC_DNET_SOCKADDR_SA_LEN],
[AC_MSG_CHECKING(for sa_len in sockaddr struct)
AC_CACHE_VAL(ac_cv_dnet_sockaddr_has_sa_len,
AC_TRY_COMPILE([
@@ -60,7 +60,7 @@
dnl be included in the search
dnl
dnl
-AC_DEFUN(AC_SEARCH_TYPE,
+AC_DEFUN([AC_SEARCH_TYPE],
[AC_MSG_CHECKING(if $1 defined)
AC_CACHE_VAL(ac_cv_type_$1,
AC_TRY_COMPILE(
diff -u -r -N ganglia-monitor-core-2.5.7.orig/ganglia.html
ganglia-monitor-core-2.5.7/ganglia.html
--- ganglia-monitor-core-2.5.7.orig/ganglia.html 2004-10-12
22:52:05.000000000 +0200
+++ ganglia-monitor-core-2.5.7/ganglia.html 2004-12-15 14:25:31.342459159
+0100
@@ -320,11 +320,11 @@
<p>If you are installing by source on Linux, scripts are provided to start
<code>gmetad</code> and <code>gmond</code>
at system startup. They are easy to install from the source root.</p>
<pre>
- % cp ./gmond/gmond.init /etc/rc.d/init.d/gmond
+ % cp ./gmond/gmond.init /etc/init.d/gmond
% chkconfig --add gmond
% chkconfig --list gmond
gmond 0:off 1:off 2:on 3:on 4:on 5:on 6:off
- % /etc/rc.d/init.d/gmond start
+ % /etc/init.d/gmond start
Starting GANGLIA gmond: [ OK ]</pre>
<p>Repeat this step with gmetad.</p>
<p>
diff -u -r -N ganglia-monitor-core-2.5.7.orig/ganglia.pod
ganglia-monitor-core-2.5.7/ganglia.pod
--- ganglia-monitor-core-2.5.7.orig/ganglia.pod 2003-11-27 04:17:05.000000000
+0100
+++ ganglia-monitor-core-2.5.7/ganglia.pod 2004-12-15 14:25:27.336572143
+0100
@@ -247,11 +247,11 @@
If you are installing by source on Linux, scripts are provided to start
C<gmetad> and C<gmond>
at system startup. They are easy to install from the source root.
- % cp ./gmond/gmond.init /etc/rc.d/init.d/gmond
+ % cp ./gmond/gmond.init /etc/init.d/gmond
% chkconfig --add gmond
% chkconfig --list gmond
gmond 0:off 1:off 2:on 3:on 4:on 5:on 6:off
- % /etc/rc.d/init.d/gmond start
+ % /etc/init.d/gmond start
Starting GANGLIA gmond: [ OK ]
Repeat this step with gmetad.
diff -u -r -N ganglia-monitor-core-2.5.7.orig/ganglia.spec
ganglia-monitor-core-2.5.7/ganglia.spec
--- ganglia-monitor-core-2.5.7.orig/ganglia.spec 2004-10-12
22:51:42.000000000 +0200
+++ ganglia-monitor-core-2.5.7/ganglia.spec 2004-12-15 15:51:37.485574494
+0100
@@ -67,7 +67,11 @@
## BUILD
##
%build
-./configure --with-gmetad --prefix=/usr
+#./configure --with-gmetad --prefix=/usr
+aclocal
+autoconf
+automake
+%configure --with-gmetad
make
##
@@ -81,12 +85,15 @@
%post gmetad
/sbin/chkconfig --add gmetad
-if [ "$1" == "1" ]; then
- # Installing new package - start gmond
- /etc/rc.d/init.d/gmetad start
-elif [ "$1" > "1" ]; then
- # Upgrading ganglia package - restart gmond
- /etc/rc.d/init.d/gmetad restart
+# do not start a service without configuration
+#if [ "$1" = "0" ]; then
+# # Installing new package - start gmetad
+# /etc/init.d/gmetad start
+#elif [ "$1" = "1" ]; then
+if [ "$1" = "1" ]; then
+ # Upgrading ganglia package
+ # - restart gmetad only when it is running
+ /etc/init.d/gmetad status >/dev/null 2>&1 && /etc/init.d/gmetad restart ||
true
fi
@@ -96,12 +103,15 @@
%post gmond
/sbin/chkconfig --add gmond
-if [ "$1" == "1" ]; then
- # Installing new package - start gmond
- /etc/rc.d/init.d/gmond start
-elif [ "$1" > "1" ]; then
- # Upgrading ganglia package - restart gmond
- /etc/rc.d/init.d/gmond restart
+# do not start a service without configuration
+#if [ "$1" = "0" ]; then
+# # Installing new package - start gmond
+# /etc/init.d/gmond start
+#elif [ "$1" = "1" ]; then
+if [ "$1" = "1" ]; then
+ # Upgrading ganglia package
+ # - restart gmond only when it is running
+ /etc/init.d/gmond status >/dev/null 2>&1 && /etc/init.d/gmond restart ||
true
fi
@@ -109,9 +119,9 @@
## PREUN GMETA
##
%preun gmetad
-if [ "$1" = 0 ]
+if [ "$1" = "0" ]
then
- /etc/rc.d/init.d/gmetad stop
+ /etc/init.d/gmetad stop
/sbin/chkconfig --del gmetad
fi
@@ -119,9 +129,9 @@
## PREUN GMON
##
%preun gmond
-if [ "$1" = 0 ]
+if [ "$1" = "0" ]
then
- /etc/rc.d/init.d/gmond stop
+ /etc/init.d/gmond stop
/sbin/chkconfig --del gmond
fi
@@ -129,14 +139,15 @@
## INSTALL
##
%install
-%__mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+%__mkdir -p $RPM_BUILD_ROOT/etc/init.d
%__mkdir -p $RPM_BUILD_ROOT/usr/include/ganglia
%__mkdir -p $RPM_BUILD_ROOT/var/lib/ganglia/rrds
-%__cp -f %{_builddir}/%{name}-%{version}/gmond/gmond.init
$RPM_BUILD_ROOT/etc/rc.d/init.d/gmond
-%__cp -f %{_builddir}/%{name}-%{version}/gmetad/gmetad.init
$RPM_BUILD_ROOT/etc/rc.d/init.d/gmetad
+%__cp -f %{_builddir}/%{name}-%{version}/gmond/gmond.init
$RPM_BUILD_ROOT/etc/init.d/gmond
+%__cp -f %{_builddir}/%{name}-%{version}/gmetad/gmetad.init
$RPM_BUILD_ROOT/etc/init.d/gmetad
%__cp -f %{_builddir}/%{name}-%{version}/gmond/gmond.conf
$RPM_BUILD_ROOT/etc/gmond.conf
%__cp -f %{_builddir}/%{name}-%{version}/gmetad/gmetad.conf
$RPM_BUILD_ROOT/etc/gmetad.conf
-%__make install prefix=$RPM_BUILD_ROOT/usr
+#__make install prefix=$RPM_BUILD_ROOT/usr
+%__make install DESTDIR=$RPM_BUILD_ROOT
##
## FILES GMETA
@@ -145,7 +156,7 @@
%defattr(-,root,root)
%attr(0755,nobody,nobody)/var/lib/ganglia/rrds
/usr/sbin/gmetad
-/etc/rc.d/init.d/gmetad
+/etc/init.d/gmetad
%config(noreplace) /etc/gmetad.conf
##
@@ -156,13 +167,17 @@
%attr(0500,root,root)/usr/bin/gmetric
%attr(0555,root,root)/usr/bin/gstat
/usr/sbin/gmond
-/etc/rc.d/init.d/gmond
+/etc/init.d/gmond
%config(noreplace) /etc/gmond.conf
%files lib
/usr/include/ganglia.h
/usr/include/ganglia
+%ifarch x86_64
+/usr/lib64/libganglia*
+%else
/usr/lib/libganglia*
+%endif
##
## CLEAN
diff -u -r -N ganglia-monitor-core-2.5.7.orig/ganglia.spec.in
ganglia-monitor-core-2.5.7/ganglia.spec.in
--- ganglia-monitor-core-2.5.7.orig/ganglia.spec.in 2003-11-07
20:56:50.000000000 +0100
+++ ganglia-monitor-core-2.5.7/ganglia.spec.in 2004-12-15 15:53:05.939342094
+0100
@@ -67,7 +67,11 @@
## BUILD
##
%build
-./configure --with-gmetad --prefix=/usr
+#./configure --with-gmetad --prefix=/usr
+aclocal
+autoconf
+automake
+%configure --with-gmetad
make
##
@@ -81,12 +85,15 @@
%post gmetad
/sbin/chkconfig --add gmetad
-if [ "$1" == "1" ]; then
- # Installing new package - start gmond
- /etc/rc.d/init.d/gmetad start
-elif [ "$1" > "1" ]; then
- # Upgrading ganglia package - restart gmond
- /etc/rc.d/init.d/gmetad restart
+# do not start a service without configuration
+#if [ "$1" = "0" ]; then
+# # Installing new package - start gmetad
+# /etc/init.d/gmetad start
+#elif [ "$1" = "1" ]; then
+if [ "$1" = "1" ]; then
+ # Upgrading ganglia package
+ # - restart gmetad only when it is running
+ /etc/init.d/gmetad status >/dev/null 2>&1 && /etc/init.d/gmetad restart ||
true
fi
@@ -96,12 +103,15 @@
%post gmond
/sbin/chkconfig --add gmond
-if [ "$1" == "1" ]; then
- # Installing new package - start gmond
- /etc/rc.d/init.d/gmond start
-elif [ "$1" > "1" ]; then
- # Upgrading ganglia package - restart gmond
- /etc/rc.d/init.d/gmond restart
+# do not start a service without configuration
+#if [ "$1" = "0" ]; then
+# # Installing new package - start gmond
+# /etc/init.d/gmond start
+#elif [ "$1" = "1" ]; then
+if [ "$1" = "1" ]; then
+ # Upgrading ganglia package
+ # - restart gmond only when it is running
+ /etc/init.d/gmond status >/dev/null 2>&1 && /etc/init.d/gmond restart ||
true
fi
@@ -109,9 +119,9 @@
## PREUN GMETA
##
%preun gmetad
-if [ "$1" = 0 ]
+if [ "$1" = "0" ]
then
- /etc/rc.d/init.d/gmetad stop
+ /etc/init.d/gmetad stop
/sbin/chkconfig --del gmetad
fi
@@ -119,9 +129,9 @@
## PREUN GMON
##
%preun gmond
-if [ "$1" = 0 ]
+if [ "$1" = "0" ]
then
- /etc/rc.d/init.d/gmond stop
+ /etc/init.d/gmond stop
/sbin/chkconfig --del gmond
fi
@@ -129,14 +139,15 @@
## INSTALL
##
%install
-%__mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+%__mkdir -p $RPM_BUILD_ROOT/etc/init.d
%__mkdir -p $RPM_BUILD_ROOT/usr/include/ganglia
%__mkdir -p $RPM_BUILD_ROOT/var/lib/ganglia/rrds
-%__cp -f %{_builddir}/%{name}-%{version}/gmond/gmond.init
$RPM_BUILD_ROOT/etc/rc.d/init.d/gmond
-%__cp -f %{_builddir}/%{name}-%{version}/gmetad/gmetad.init
$RPM_BUILD_ROOT/etc/rc.d/init.d/gmetad
+%__cp -f %{_builddir}/%{name}-%{version}/gmond/gmond.init
$RPM_BUILD_ROOT/etc/init.d/gmond
+%__cp -f %{_builddir}/%{name}-%{version}/gmetad/gmetad.init
$RPM_BUILD_ROOT/etc/init.d/gmetad
%__cp -f %{_builddir}/%{name}-%{version}/gmond/gmond.conf
$RPM_BUILD_ROOT/etc/gmond.conf
%__cp -f %{_builddir}/%{name}-%{version}/gmetad/gmetad.conf
$RPM_BUILD_ROOT/etc/gmetad.conf
-%__make install prefix=$RPM_BUILD_ROOT/usr
+#__make install prefix=$RPM_BUILD_ROOT/usr
+%__make install DESTDIR=$RPM_BUILD_ROOT
##
## FILES GMETA
@@ -145,7 +156,7 @@
%defattr(-,root,root)
%attr(0755,nobody,nobody)/var/lib/ganglia/rrds
/usr/sbin/gmetad
-/etc/rc.d/init.d/gmetad
+/etc/init.d/gmetad
%config(noreplace) /etc/gmetad.conf
##
@@ -156,13 +167,17 @@
%attr(0500,root,root)/usr/bin/gmetric
%attr(0555,root,root)/usr/bin/gstat
/usr/sbin/gmond
-/etc/rc.d/init.d/gmond
+/etc/init.d/gmond
%config(noreplace) /etc/gmond.conf
%files lib
/usr/include/ganglia.h
/usr/include/ganglia
+%ifarch x86_64
+/usr/lib64/libganglia*
+%else
/usr/lib/libganglia*
+%endif
##
## CLEAN
diff -u -r -N ganglia-monitor-core-2.5.7.orig/gmetad/gmetad.init
ganglia-monitor-core-2.5.7/gmetad/gmetad.init
--- ganglia-monitor-core-2.5.7.orig/gmetad/gmetad.init 2002-10-18
23:57:58.000000000 +0200
+++ ganglia-monitor-core-2.5.7/gmetad/gmetad.init 2004-12-15
15:34:15.472138488 +0100
@@ -1,12 +1,35 @@
-#!/bin/sh
+#! /bin/bash
# $Id: gmetad.init,v 1.2 2002/10/18 21:57:58 sacerdoti Exp $
#
# chkconfig: 2345 20 80
# description: gmetad startup script
#
+### BEGIN INIT INFO
+# Provides: gmetad
+# Required-Start: $network
+# Should-Start: coldplug pcmcia
+# Required-Stop:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop:
+# Description: gmetad startup script
+### END INIT INFO
+
GMETAD=/usr/sbin/gmetad
+GMETADs=${GMETAD##*/}
+
+dist="none"
-. /etc/rc.d/init.d/functions
+if [ -f /etc/rc.d/init.d/functions ]; then
+ # redhat etc.
+ . /etc/rc.d/init.d/functions
+ dist="redhat"
+elif [ -f /etc/rc.status ]; then
+ # suse etc.
+ . /etc/rc.status
+ rc_reset
+ dist="suse"
+fi
RETVAL=0
@@ -15,18 +38,46 @@
echo -n "Starting GANGLIA gmetad: "
[ -f $GMETAD ] || exit 1
- daemon $GMETAD
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gmetad
+ case $dist in
+ redhat)
+ daemon $GMETAD
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gmetad
+ ;;
+ suse)
+ $GMETAD
+ rc_status -v
+ ;;
+ *)
+ $GMETAD
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gmetad
+ ;;
+ esac
;;
stop)
echo -n "Shutting down GANGLIA gmetad: "
- killproc gmetad
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gmetad
+ case $dist in
+ redhat)
+ killproc $GMETADs
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gmetad
+ ;;
+ suse)
+ killproc $GMETADs
+ rc_status -v
+ ;;
+ *)
+ killall $GMETADs
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gmetad
+ ;;
+ esac
;;
restart|reload)
@@ -35,12 +86,28 @@
RETVAL=$?
;;
status)
- status gmetad
- RETVAL=$?
+ case $dist in
+ suse)
+ checkproc $GMETADs
+ rc_status -v
+ ;;
+ *)
+ status $GMETADs
+ RETVAL=$?
+ ;;
+ esac
;;
*)
echo "Usage: $0 {start|stop|restart|status}"
exit 1
+ ;;
esac
-exit $RETVAL
+case $dist in
+ suse)
+ rc_exit
+ ;;
+ *)
+ exit $RETVAL
+ ;;
+esac
diff -u -r -N ganglia-monitor-core-2.5.7.orig/gmond/gmond.init
ganglia-monitor-core-2.5.7/gmond/gmond.init
--- ganglia-monitor-core-2.5.7.orig/gmond/gmond.init 2003-03-07
21:38:30.000000000 +0100
+++ ganglia-monitor-core-2.5.7/gmond/gmond.init 2004-12-15 15:33:38.399601042
+0100
@@ -4,9 +4,32 @@
# chkconfig: 2345 70 40
# description: gmond startup script
#
+### BEGIN INIT INFO
+# Provides: gmond
+# Required-Start: $network
+# Should-Start: coldplug pcmcia
+# Required-Stop:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop:
+# Description: gmond startup script
+### END INIT INFO
+
GMOND=/usr/sbin/gmond
+GMONDs=${GMOND##*/}
+
+dist="none"
-. /etc/rc.d/init.d/functions
+if [ -f /etc/rc.d/init.d/functions ]; then
+ # redhat etc.
+ . /etc/rc.d/init.d/functions
+ dist="redhat"
+elif [ -f /etc/rc.status ]; then
+ # suse etc.
+ . /etc/rc.status
+ rc_reset
+ dist="suse"
+fi
RETVAL=0
@@ -15,32 +38,76 @@
echo -n "Starting GANGLIA gmond: "
[ -f $GMOND ] || exit 1
- daemon $GMOND
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gmond
- ;;
+ case $dist in
+ redhat)
+ daemon $GMOND
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gmond
+ ;;
+ suse)
+ $GMOND
+ rc_status -v
+ ;;
+ *)
+ $GMOND
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gmond
+ ;;
+ esac
+ ;;
stop)
echo -n "Shutting down GANGLIA gmond: "
- killproc gmond
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gmond
- ;;
+ case $dist in
+ redhat)
+ killproc $GMONDs
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gmond
+ ;;
+ suse)
+ killproc $GMONDs
+ rc_status -v
+ ;;
+ *)
+ killall $GMONDs
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/gmond
+ ;;
+ esac
+ ;;
restart|reload)
- $0 stop
- $0 start
- RETVAL=$?
- ;;
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
status)
- status gmond
- RETVAL=$?
- ;;
+ case $dist in
+ suse)
+ checkproc $GMONDs
+ rc_status -v
+ ;;
+ *)
+ status $GMONDs
+ RETVAL=$?
+ ;;
+ esac
+ ;;
*)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+ ;;
esac
-exit $RETVAL
+case $dist in
+ suse)
+ rc_exit
+ ;;
+ *)
+ exit $RETVAL
+ ;;
+esac
diff -u -r -N ganglia-monitor-core-2.5.7.orig/lib/Makefile.am
ganglia-monitor-core-2.5.7/lib/Makefile.am
--- ganglia-monitor-core-2.5.7.orig/lib/Makefile.am 2003-11-06
20:00:30.000000000 +0100
+++ ganglia-monitor-core-2.5.7/lib/Makefile.am 2004-12-15 08:08:40.943474658
+0100
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I.. -I. -I./dnet
+AM_CFLAGS = -I/usr/src/linux/include -I.. -I. -I./dnet
EXTRA_DIST = xmltok_impl.c xmltok_ns.c EXPAT gangliaconf.h ganglia