From 018d57abccb1ad0310792a3018cad652c2bc70c6 Mon Sep 17 00:00:00 2001
From: Mihai Ibanescu <misa@redhat.com>
Date: Thu, 4 May 2006 14:58:31 -0400
Subject: Merged Michael's changes with mine

---
 Makefile | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d8174f8..8e917c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,21 @@
-all: clean test manpage install
-
 clean:
-	@rm -f *.gz *.rpm MANIFEST
-	@rm -rf cobbler-* dist build
+	\rm -f cobbler*.gz cobbler*.rpm MANIFEST
+	\rm -rf cobbler-* dist build
 
 manpage:
-	pod2man --center="cobbler" --release="" cobbler.pod > cobbler.1
-	@\rm -f cobbler.1.gz
-	gzip cobbler.1
+	pod2man --center="cobbler" --release="" cobbler.pod | gzip -c > cobbler.1.gz
 
 test:
 	python tests/tests.py
 
-install: clean
+install: clean manpage
 	python setup.py sdist
 	cp dist/*.gz .
-	rpmbuild --define "_topdir %(pwd)" --define "_builddir %{_topdir}" --define "_rpmdir %{_topdir}" --define "_srcrpmdir %{_topdir}" --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' --define "_specdir %{_topdir}" --define "_sourcedir  %{_topdir}" -ba cobbler.spec
-
+	rpmbuild --define "_topdir %(pwd)" \
+	--define "_builddir %{_topdir}" \
+	--define "_rpmdir %{_topdir}" \
+	--define "_srcrpmdir %{_topdir}" \
+	--define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
+	--define "_specdir %{_topdir}" \
+	--define "_sourcedir  %{_topdir}" \
+	-ba cobbler.spec
-- 
cgit