X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=01b915d325a6101f31bc66962ef09098ef29f02a;hb=919c9c3a4f5418b55108c1ec903160f0400900df;hp=013acc76b4df6cf2df1b41338f95daaca7a7a5dd;hpb=1b545eb1f1874cd5ba38d849c489785f947018f3;p=certmaster.git

diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index 013acc7..01b915d
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-VERSION		= $(shell echo `awk '{ print $$1 }' version`)
-RELEASE		= $(shell echo `awk '{ print $$2 }' version`)
-NEWRELEASE	= $(shell echo $$(($(RELEASE) + 1)))
+VERSION		= 0.24 
+RELEASE		= 5 
+PYTHON		= /usr/bin/python
 
 MESSAGESPOT=po/messages.pot
 
@@ -14,23 +14,17 @@ all: rpms
 
 
 manpage:
-	pod2man --center="certmaster-request" --release="" ./docs/certmaster-inventory.pod | gzip -c > ./docs/certmaster-request.1.gz
+	pod2man --center="certmaster-request" --release="" ./docs/certmaster-request.pod | gzip -c > ./docs/certmaster-request.1.gz
 	pod2man --center="certmaster" --release="" ./docs/certmaster.pod | gzip -c > ./docs/certmaster.1.gz
 	pod2man --center="certmaster-ca" --release="" ./docs/certmaster-ca.pod | gzip -c > ./docs/certmaster-ca.1.gz
 
 messages: certmaster/*.py
+	touch $(MESSAGESPOT)
 	xgettext -k_ -kN_ -o $(MESSAGESPOT) certmaster/*.py
 	sed -i'~' -e 's/SOME DESCRIPTIVE TITLE/certmaster/g' -e 's/YEAR THE PACKAGE'"'"'S COPYRIGHT HOLDER/2007 Red Hat, inc. /g' -e 's/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR/Adrian Likins <alikins@redhat.com>, 2007/g' -e 's/PACKAGE VERSION/certmaster $(VERSION)-$(RELEASE)/g' -e 's/PACKAGE/certmaster/g' $(MESSAGESPOT)
 
-
-bumprelease:	
-	-echo "$(VERSION) $(NEWRELEASE)" > version
-
-setversion: 
-	-echo "$(VERSION) $(RELEASE)" > version
-
 build: clean
-	python setup.py build -f
+	$(PYTHON) setup.py build -f
 
 clean:
 	-rm -f  MANIFEST
@@ -41,7 +35,7 @@ clean:
 	-for d in $(DIRS); do ($(MAKE) -C $$d clean ); done
 
 clean_hard:
-	-rm -rf $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/certmaster 
+	-rm -rf $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/certmaster 
 
 clean_harder:
 	-rm -rf /etc/pki/certmaster
@@ -52,7 +46,7 @@ clean_hardest: clean_rpms
 
 
 install: build manpage
-	python setup.py install -f
+	$(PYTHON) setup.py install -f
 
 install_hard: clean_hard install
 
@@ -72,7 +66,7 @@ clean_rpms:
 	-rpm -e certmaster
 
 sdist: messages
-	python setup.py sdist
+	$(PYTHON) setup.py sdist
 
 new-rpms: bumprelease rpms
 
@@ -91,7 +85,6 @@ async: install
 rpms: build manpage sdist
 	mkdir -p rpm-build
 	cp dist/*.gz rpm-build/
-	cp version rpm-build/
 	rpmbuild --define "_topdir %(pwd)/rpm-build" \
 	--define "_builddir %{_topdir}" \
 	--define "_rpmdir %{_topdir}" \