Index: /branches/1.0/Makefile
===================================================================
--- /branches/1.0/Makefile	(revision 900)
+++ /branches/1.0/Makefile	(revision 901)
@@ -30,122 +30,120 @@
 all:
 
-tarball:	tarball-gzip tarball-bzip
+tarball:    tarball-gzip tarball-bzip
 
-tarball-gzip:	${REQUIRED} ./pkg/rpm/jobmonarch.spec ./debian/changelog
-	mkdir -p ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}
-	( rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php \
-	. ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION} )
-	( cd ${TMPDIR}/.monarch_buildroot; tar zcvf ganglia_jobmonarch-${VERSION}.tar.gz ./ganglia_jobmonarch-${VERSION} )
-	mv ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}.tar.gz ..
+tarball-gzip:    ${REQUIRED} ./pkg/rpm/jobmonarch.spec ./debian/changelog
+    mkdir -p ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}
+    ( rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php \
+    . ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION} )
+    ( cd ${TMPDIR}/.monarch_buildroot; tar zcvf ganglia_jobmonarch-${VERSION}.tar.gz ./ganglia_jobmonarch-${VERSION} )
+    mv ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}.tar.gz ..
 
-tarball-bzip:	${REQUIRED} ./pkg/rpm/jobmonarch.spec ./debian/changelog
-	mkdir -p ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}
-	( rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php \
-	. ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION} )
-	( cd ${TMPDIR}/.monarch_buildroot; tar jcvf ganglia_jobmonarch-${VERSION}.tar.bz2 ./ganglia_jobmonarch-${VERSION} )
-	mv ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}.tar.bz2 ..
+tarball-bzip:    ${REQUIRED} ./pkg/rpm/jobmonarch.spec ./debian/changelog
+    mkdir -p ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}
+    ( rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php \
+    . ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION} )
+    ( cd ${TMPDIR}/.monarch_buildroot; tar jcvf ganglia_jobmonarch-${VERSION}.tar.bz2 ./ganglia_jobmonarch-${VERSION} )
+    mv ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}.tar.bz2 ..
 
 rpmspec: ./pkg/rpm/jobmonarch.spec
 
 ./pkg/rpm/jobmonarch.spec: pkg/rpm/jobmonarch.spec.in Makefile
-	sed -e 's/__VERSION__/${VERSION}/g' -e 's/__RELEASE__/${RELEASE}/g' ./pkg/rpm/jobmonarch.spec.in > ./pkg/rpm/jobmonarch.spec
+    sed -e 's/__VERSION__/${VERSION}/g' -e 's/__RELEASE__/${RELEASE}/g' ./pkg/rpm/jobmonarch.spec.in > ./pkg/rpm/jobmonarch.spec
 
 rpm: tarball-bzip
-	rpmbuild -tb ../ganglia_jobmonarch-${VERSION}.tar.bz2
+    rpmbuild -tb ../ganglia_jobmonarch-${VERSION}.tar.bz2
 
 srpm: tarball-bzip
-	rpmbuild -ts --define '%dist %{nil}' ../ganglia_jobmonarch-${VERSION}.tar.bz2
+    rpmbuild -ts --define '%dist %{nil}' ../ganglia_jobmonarch-${VERSION}.tar.bz2
 
 debchangelog: ./debian/changelog
 
 ./debian/changelog: ./debian/changelog.in Makefile
-	sed -e 's/__VERSION__/${VERSION}/g' -e 's/__RELEASE__/${RELEASE}/g' ./debian/changelog.in > ./debian/changelog
+    sed -e 's/__VERSION__/${VERSION}/g' -e 's/__RELEASE__/${RELEASE}/g' ./debian/changelog.in > ./debian/changelog
 
 deb: ${REQUIRED} ./debian ./debian/changelog
-	dpkg-buildpackage -b -uc -us
+    dpkg-buildpackage -b -uc -us
 
-install:
-	@#
-	@# Set the correct GANGLIA_PATH.
-	@#
-	@echo
-	@echo "Using $(GANGLIA_ROOT) as Ganglia root installation path. If it's not what"
-	@echo "you want, use make GANGLIA_ROOT=/path/to/your/ganglia/root ."
-	@sed -e 's|__GANGLIA_ROOT__|$(GANGLIA_ROOT)/|g' web/conf.php.in > web/addons/job_monarch/conf.php
-	@#
-	@# Set the correct JOBARCHIVE_RRDS in jobarchve.conf and ganglia conf.php
-	@#
-	@echo
-	@echo "Using $(JOBARCHIVE_RRDS) as jobarchive path to  store rrds files. If it's not what"
-	@echo "you want, use make JOBARCHIVE_RRDS=/path/to/you/jobarchived/rrdsfiles ."
-	@sed -i -e 's|/var/lib/jobarchive|$(JOBARCHIVE_RRDS)|g' jobarchived/jobarchived.conf web/addons/job_monarch/conf.php
-	@#
-	@# Files in SBIN_DIR
-	@#
-	@echo
-	@echo "Installing jobmond.py and jobarchived.py to $(PREFIX)/sbin"
-	@install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin
-	@install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/
-	@install -m 0755 jobarchived/jobarchived.py $(DESTDIR)$(PREFIX)/sbin/
-	@(cd $(DESTDIR)$(PREFIX)/sbin/; ln -s jobmond.py jobmond; ln -s jobarchived.py jobarchived)
-	@#
-	@# Files specific to distros if /etc/redhat_release => rpm else (/etc/debian_version => debian)
-	@#
-	@echo
-	@echo "Installing service files in /etc"
-	@if test -r /etc/redhat_release; then \
-		install -m 0755 -d $(DESTDIR)/etc/rc.d/init.d; \
-		install -m 0755 pkg/rpm/init.d/jobmond $(DESTDIR)/etc/rc.d/init.d/; \
-		install -m 0755 pkg/rpm/init.d/jobarchived $(DESTDIR)/etc/rc.d/init.d/; \
-		install -m 0755 -d $(DESTDIR)/etc/sysconfig; \
-		install -m 0755 pkg/rpm/sysconfig/jobmond $(DESTDIR)/etc/sysconfig; \
-		install -m 0755 pkg/rpm/sysconfig/jobarchived $(DESTDIR)/etc/sysconfig; \
-	else \
-		install -m 0755 -d $(DESTDIR)/etc/init.d; \
-		install -m 0755 pkg/deb/init.d/jobmond $(DESTDIR)/etc/init.d/; \
-		install -m 0755 pkg/deb/init.d/jobarchived $(DESTDIR)/etc/init.d/; \
-		install -m 0755 -d $(DESTDIR)/etc/default; \
-		install -m 0755 pkg/deb/default/jobmond $(DESTDIR)/etc/default; \
-		install -m 0755 pkg/deb/default/jobarchived $(DESTDIR)/etc/default; \
-	fi
-	@#
-	@# Files in /etc
-	@#
-	@echo
-	@echo "Installing config files jobmond.conf jobarchived.conf in /etc"
-	@install -m 0644 jobmond/jobmond.conf $(DESTDIR)/etc
-	@install -m 0644 jobarchived/jobarchived.conf $(DESTDIR)/etc
-	@#
-	@# Files in /usr/share
-	@#
-	@echo
-	@echo "Installing job_dbase.sql in $(PREFIX)/share/jobarchived"
-	@install -m 0755 -d $(DESTDIR)$(PREFIX)/share/jobarchived
-	@install -m 0755 jobarchived/job_dbase.sql $(DESTDIR)$(PREFIX)/share/jobarchived/
-	@#
-	@# Create the /var/lib/jobarchive directory where rrds are stored.
-	@#
-	@echo
-	@echo "Creating the directory where RRDs will be stored: $(JOBARCHIVE_RRDS)"
-	@install -m 0755 -d $(DESTDIR)$(JOBARCHIVE_RRDS)
-	@#
-	@# Files for ganglia
-	@#
-	@echo
-	@echo "Installing Ganglia web interface to $(GANGLIA_ROOT) ."
-	@install -m 0755 -d $(DESTDIR)$(GANGLIA_ROOT)
-	@chown -R $(GANGLIA_USER) ./web
-	@chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/compiled
-	@chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/cache
-	@chmod 775 ./web/addons/job_monarch/dwoo/cache
-	@(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php ./addons ./templates $(DESTDIR)$(GANGLIA_ROOT)/)
-	@#
-	@echo
-	@echo "Installation complete."
-	@echo
+install: @#
+    @# Set the correct GANGLIA_PATH.
+    @#
+    @echo
+    @echo "Using $(GANGLIA_ROOT) as Ganglia root installation path. If it's not what"
+    @echo "you want, use make GANGLIA_ROOT=/path/to/your/ganglia/root ."
+    @sed -e 's|__GANGLIA_ROOT__|$(GANGLIA_ROOT)/|g' web/conf.php.in > web/addons/job_monarch/conf.php
+    @#
+    @# Set the correct JOBARCHIVE_RRDS in jobarchve.conf and ganglia conf.php
+    @#
+    @echo
+    @echo "Using $(JOBARCHIVE_RRDS) as jobarchive path to  store rrds files. If it's not what"
+    @echo "you want, use make JOBARCHIVE_RRDS=/path/to/you/jobarchived/rrdsfiles ."
+    @sed -i -e 's|/var/lib/jobarchive|$(JOBARCHIVE_RRDS)|g' jobarchived/jobarchived.conf web/addons/job_monarch/conf.php
+    @#
+    @# Files in SBIN_DIR
+    @#
+    @echo
+    @echo "Installing jobmond.py and jobarchived.py to $(PREFIX)/sbin"
+    @install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin
+    @install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/
+    @install -m 0755 jobarchived/jobarchived.py $(DESTDIR)$(PREFIX)/sbin/
+    @(cd $(DESTDIR)$(PREFIX)/sbin/; ln -s jobmond.py jobmond; ln -s jobarchived.py jobarchived)
+    @#
+    @# Files specific to distros if /etc/redhat_release => rpm else (/etc/debian_version => debian)
+    @#
+    @echo
+    @echo "Installing service files in /etc"
+    @if test -r /etc/redhat_release; then \
+        install -m 0755 -d $(DESTDIR)/etc/rc.d/init.d; \
+        install -m 0755 pkg/rpm/init.d/jobmond $(DESTDIR)/etc/rc.d/init.d/; \
+        install -m 0755 pkg/rpm/init.d/jobarchived $(DESTDIR)/etc/rc.d/init.d/; \
+        install -m 0755 -d $(DESTDIR)/etc/sysconfig; \
+        install -m 0755 pkg/rpm/sysconfig/jobmond $(DESTDIR)/etc/sysconfig; \
+        install -m 0755 pkg/rpm/sysconfig/jobarchived $(DESTDIR)/etc/sysconfig; \
+    else \
+        install -m 0755 -d $(DESTDIR)/etc/init.d; \
+        install -m 0755 pkg/deb/init.d/jobmond $(DESTDIR)/etc/init.d/; \
+        install -m 0755 pkg/deb/init.d/jobarchived $(DESTDIR)/etc/init.d/; \
+        install -m 0755 -d $(DESTDIR)/etc/default; \
+        install -m 0755 pkg/deb/default/jobmond $(DESTDIR)/etc/default; \
+        install -m 0755 pkg/deb/default/jobarchived $(DESTDIR)/etc/default; \
+    fi
+    @#
+    @# Files in /etc
+    @#
+    @echo
+    @echo "Installing config files jobmond.conf jobarchived.conf in /etc"
+    @install -m 0644 jobmond/jobmond.conf $(DESTDIR)/etc
+    @install -m 0644 jobarchived/jobarchived.conf $(DESTDIR)/etc
+    @#
+    @# Files in /usr/share
+    @#
+    @echo
+    @echo "Installing job_dbase.sql in $(PREFIX)/share/jobarchived"
+    @install -m 0755 -d $(DESTDIR)$(PREFIX)/share/jobarchived
+    @install -m 0755 jobarchived/job_dbase.sql $(DESTDIR)$(PREFIX)/share/jobarchived/
+    @#
+    @# Create the /var/lib/jobarchive directory where rrds are stored.
+    @#
+    @echo
+    @echo "Creating the directory where RRDs will be stored: $(JOBARCHIVE_RRDS)"
+    @install -m 0755 -d $(DESTDIR)$(JOBARCHIVE_RRDS)
+    @#
+    @# Files for ganglia
+    @#
+    @echo
+    @echo "Installing Ganglia web interface to $(GANGLIA_ROOT) ."
+    @install -m 0755 -d $(DESTDIR)$(GANGLIA_ROOT)
+    @chown -R $(GANGLIA_USER) ./web
+    @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/compiled
+    @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/cache
+    @chmod 775 ./web/addons/job_monarch/dwoo/cache
+    @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php ./addons ./templates $(DESTDIR)$(GANGLIA_ROOT)/)
+    @#
+    @echo
+    @echo "Installation complete."
+    @echo
 
-clean:
-	@rm -rf ${TMPDIR}/.monarch_buildroot
-	@rm -rf ./pkg/rpm/jobmonarch.spec
-	@(cd ./debian; rm -rf files *.log *.substvars jobmonarch/ jobmonarch-jobmond/ jobmonarch-jobarchived/ jobmonarch-webfrontend/ tmp/)
-	@rm -f web/addons/job_monarch/conf.php
+clean: @rm -rf ${TMPDIR}/.monarch_buildroot
+    @rm -rf ./pkg/rpm/jobmonarch.spec
+    @(cd ./debian; rm -rf files *.log *.substvars jobmonarch/ jobmonarch-jobmond/ jobmonarch-jobarchived/ jobmonarch-webfrontend/ tmp/)
+    @rm -f web/addons/job_monarch/conf.php
