changelog format fix

[dbuscron] / Makefile

diff --git a/Makefile b/Makefile
index 2c833ae..53b6053 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,23 +2,28 @@
 DESTDIR ?= 
 PYMODULES ?= $(DESTDIR)/usr/lib/pymodules/python2.5
 PREFIX ?= $(DESTDIR)/usr/bin
-PYSUFFIX = `test -e ./dbuscron/__init__.pyo && echo pyo || echo pyc`
 PYVERSION ?= 2.5
 
-all:
-       @echo "No compilation needed."
+BINFILES = dbuscron.py dbuscrontab.py migrate-dbus-scripts.py
 
-install:
-       install -o root -g root -m 0755 ./dbuscron.py $(PREFIX)/dbuscron
-       install -o root -g root -m 0755 ./dbuscrontab.py $(PREFIX)/dbuscrontab
+.SUFFIXES: .py .pyo
+
+compile: .py.pyo
+
+.py.pyo:
+       sed -i.bak -e "s/%VERSION%/`git describe --tags`/" ./dbuscron/__init__.py
+       python$(PYVERSION) -O -m compileall ./dbuscron
+       mv -f ./dbuscron/__init__.py.bak ./dbuscron/__init__.py
+
+install: compile
+       for f in $(BINFILES); do \
+               install -o root -g root -m 0755 ./$$f $(PREFIX)/`basename $$f .py`; done
        install -o root -g root -m 0755 -d $(PYMODULES)/dbuscron/shell
-       sed -i -e "s/%VERSION%/`git describe --tags`/" ./dbuscron/__init__.py
-       python$(PYVERSION) -O -c 'import dbuscron, dbuscron.shell.main, dbuscron.shell.edit'
-       install -o root -g root -m 0644 ./dbuscron/*.$(PYSUFFIX) $(PYMODULES)/dbuscron
-       install -o root -g root -m 0644 ./dbuscron/shell/*.$(PYSUFFIX) $(PYMODULES)/dbuscron/shell
+       find ./dbuscron -name "*.pyo" | xargs -I {} install -o root -g root -m 0644 {} $(PYMODULES)/{}
        install -o root -g root -m 0644 ./event.d/dbuscron $(DESTDIR)/etc/event.d/dbuscron
-       -test ! -f $(DESTDIR)/etc/dbuscrontab && \
+       test -f $(DESTDIR)/etc/dbuscrontab || \
                install -o root -g root -m 0644 ./doc/dbuscrontab $(DESTDIR)/etc/dbuscrontab
+       @echo ""
        @echo "Installation complete. Run \`dbuscrontab -e' to edit config file,"
        @echo "then run \`initctl start dbuscron' to start dbuscron daemon."
 
@@ -39,5 +44,12 @@ debclean:
 deb: debclean
        debuild binary-indep
 
-.PHONY: all install uninstall clean debclean deb
+build: debclean
+       ./genchangelog $(B)
+       git commit -m "changelog updated" ./debian/changelog
+       git tag -f v$(B)
+       git push -f origin v$(B)
+       $(MAKE) deb
+
+.PHONY: install uninstall clean debclean deb build compile