Default to virtio system disks

[autocluster.git] / Makefile

diff --git a/Makefile b/Makefile
index 2d794c119d8a9472554cd7643c8e3c432b59bd89..f39cb5cf6fa05bf9b226be78a2a5d916c6dc88eb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,13 @@
-datetm = $$(git log --pretty='format:%ci.%h' -1 | sed -e 's/[-: ]//g' -e 's/+.*//')
-hash   = $$(git log --pretty='format:%h' -1)
-version = 0.1.${datetm}.${hash}
+version=$$(git describe | sed -e 's@autocluster-@@' -e 's@-@_@g')
 
 prefix = /usr/local
 datadir        = ${prefix}/share/autocluster
 bindir = ${prefix}/bin
 DESTDIR        =
 
-datas  = base config.sample config.d host_setup imacros releases templates
+datas  = base config.d host_setup templates
 hacks  = autocluster.hack
-genpkg = debian/changelog autocluster.spec
+genpkg = debian/changelog autocluster.spec ChangeLog
 
 all:   $(hacks)
 
@@ -21,7 +19,7 @@ install:      all
        mkdir -p $(DESTDIR)$(datadir)
        cp -a $(datas) $(DESTDIR)$(datadir)/
        mkdir -p $(DESTDIR)$(bindir)
-       install -m 755 vircmd waitfor $(DESTDIR)$(bindir) 
+       install -m 755 vircmd $(DESTDIR)$(bindir) 
        install -m 755 autocluster.hack $(DESTDIR)$(bindir)/autocluster
 
 debian/changelog:      debian/changelog.in Makefile .git/refs/heads/master
@@ -30,6 +28,9 @@ debian/changelog:     debian/changelog.in Makefile .git/refs/heads/master
 autocluster.spec:      autocluster.spec.in Makefile .git/refs/heads/master
        sed -e "s/@@VERSION@@/$(version)/" $< > $@ || rm -f $@
 
+ChangeLog:     .git/refs/heads/master
+               git log > $@ || rm -f $@
+
 dist:  $(genpkg)
        t=autocluster-$(version) && \
        git archive --prefix=$${t}/ HEAD > $${t}.tar && \