Fix makefile to allow 'make release' to work with git

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 9c755ba4de94aa6eed1bed1f9a60c98f8f6332b4..dc3930b46b70cf8c4cde35d76f15bcdffbfa25ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ SENDER =      udevsend
 INFO =         udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
-VERSION =      056
+VERSION =      058
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -317,35 +317,10 @@ spotless: clean
        $(MAKE) -C klibc SUBDIRS=klibc spotless
        rm -rf klibc/.install
 
-DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz" -e "\/\." -e releases -e BitKeeper -e SCCS -e test/sys | sort )
-DISTDIR := $(RELEASE_NAME)
-srcdir = .
 release: spotless
-       -rm -rf $(DISTDIR)
-       mkdir $(DISTDIR)
-       chmod 777 $(DISTDIR)
-       bk export -w $(DISTDIR)
-       tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
-       rm -rf $(DISTDIR)
+       git-tar-tree HEAD $(RELEASE_NAME) | gzip -9v > $(RELEASE_NAME).tar.gz
        @echo "$(RELEASE_NAME).tar.gz created"
 
-
-small_release: $(DISTFILES) spotless
-#      @echo $(DISTFILES)
-       @-rm -rf $(DISTDIR)
-       @mkdir $(DISTDIR)
-       @-chmod 777 $(DISTDIR)
-       @for file in $(DISTFILES); do                   \
-               if test -d $$file; then                 \
-                       mkdir $(DISTDIR)/$$file;        \
-               else                                    \
-                       cp -p $$file $(DISTDIR)/$$file; \
-               fi;                                     \
-       done
-       @tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
-       @rm -rf $(DISTDIR)
-       @echo "Built $(RELEASE_NAME).tar.gz"
-
 install-config:
        $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
        @if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
@@ -427,3 +402,4 @@ uninstall: uninstall-man uninstall-dev.d
 
 test: all
        @ cd test && ./udev-test.pl
+       @ cd test && ./udevstart-test.pl