X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=blobdiff_plain;f=Makefile;h=6f5f908de9e371862fd7a4e1990499e80bac16f6;hp=9cbfc49e6a7539558c491ed63d34068055947ac1;hb=HEAD;hpb=3f460ad56ec4b219cc36287c393c28475faa15c1

diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index 9cbfc49..6f5f908
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-VERSION		= $(shell echo `awk '{ print $$1 }' version`)
-RELEASE		= $(shell echo `awk '{ print $$2 }' version`)
-NEWRELEASE	= $(shell echo $$(($(RELEASE) + 1)))
+VERSION		= 0.29
+RELEASE		= 1
+PYTHON		= /usr/bin/python
+DIST            = pwan
 
 MESSAGESPOT=po/messages.pot
 
@@ -12,25 +13,26 @@ INITDIR	= init-scripts
 
 all: rpms
 
+versionfile:
+	echo "version:" $(VERSION) > etc/version
+	echo "release:" $(RELEASE) >> etc/version
+	echo "source build date:" $(DATE) >> etc/version
+	echo "git commit:" $(shell git log -n 1 --pretty="format:%H") >> etc/version
+	echo "git date:" $(shell git log -n 1 --pretty="format:%cd") >> etc/version
 
 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
+	pod2man --center="certmaster-sync" --release="" ./docs/certmaster-sync.pod | gzip -c > ./docs/certmaster-sync.1.gz
 
-messages: certmaster/minion/*.py
-	xgettext -k_ -kN_ -o $(MESSAGESPOT) certmaster/minion/*.py
+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 +43,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 +54,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 +74,7 @@ clean_rpms:
 	-rpm -e certmaster
 
 sdist: messages
-	python setup.py sdist
+	$(PYTHON) setup.py sdist
 
 new-rpms: bumprelease rpms
 
@@ -91,8 +93,9 @@ async: install
 rpms: build manpage sdist
 	mkdir -p rpm-build
 	cp dist/*.gz rpm-build/
-	cp version rpm-build/
+	echo ${RELEASE}
 	rpmbuild --define "_topdir %(pwd)/rpm-build" \
+        --define "dist ${DIST}" \
 	--define "_builddir %{_topdir}" \
 	--define "_rpmdir %{_topdir}" \
 	--define "_srcrpmdir %{_topdir}" \