release 104

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 1b3815f3bb7069f663624d99b28ae3d9346a1908..0ef15df2020d79c565d0d05dd40dd2fa45049b07 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-# Makefile for udev
 #
-# Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+# Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
 # Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,10 +13,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 097
+VERSION = 104
 
 # set this to make use of syslog
 USE_LOG = true
@@ -44,7 +43,6 @@ EXTRAS =
 V =
 
 PROGRAMS = \
-       udev                            \
        udevd                           \
        udevtrigger                     \
        udevsettle                      \
@@ -52,6 +50,7 @@ PROGRAMS = \
        udevmonitor                     \
        udevinfo                        \
        udevtest                        \
+       test-udev                       \
        udevstart
 
 HEADERS = \
@@ -91,7 +90,7 @@ MAN_PAGES = \
 GEN_HEADERS = \
        udev_version.h
 
-prefix =
+prefix ?=
 etcdir =       ${prefix}/etc
 sbindir =      ${prefix}/sbin
 usrbindir =    ${prefix}/usr/bin
@@ -108,7 +107,7 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 PWD = $(shell pwd)
 
-CROSS_COMPILE =
+CROSS_COMPILE ?=
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
@@ -200,7 +199,7 @@ udev_version.h:
        $(Q) echo \#define UDEV_VERSION         \"$(VERSION)\" >> $@
        $(Q) echo \#define UDEV_ROOT            \"$(udevdir)\" >> $@
        $(Q) echo \#define UDEV_CONFIG_FILE     \"$(configdir)/udev.conf\" >> $@
-       $(Q) echo \#define UDEV_RULES_FILE      \"$(configdir)/rules.d\" >> $@
+       $(Q) echo \#define UDEV_RULES_DIR       \"$(configdir)/rules.d\" >> $@
 
 # man pages
 %.8 %.7: %.xml
@@ -227,8 +226,8 @@ clean:
 .PHONY: clean
 
 release:
-       git-tar-tree HEAD udev-$(VERSION) | gzip -9v > udev-$(VERSION).tar.gz
-       git-tar-tree HEAD udev-$(VERSION) | bzip2 -9v > udev-$(VERSION).tar.bz2
+       git-archive --format=tar --prefix=udev-104/ HEAD | gzip -9v > udev-$(VERSION).tar.gz
+       git-archive --format=tar --prefix=udev-104/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2
 .PHONY: release
 
 install-config:
@@ -327,10 +326,10 @@ buildtest:
 
 ChangeLog: Makefile
        @ mv $@ $@.tmp
-       @ echo "Summary of changes from v$(shell printf '%03i' $$(expr $(VERSION) - 1)) to v$(VERSION)" >> $@
+       @ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> $@
        @ echo "============================================" >> $@
        @ echo >> $@
-       @ git log --pretty=short $(shell printf '%03i' $$(expr $(VERSION) - 1))..HEAD | git shortlog  >> $@
+       @ git log --pretty=short $(shell echo $$(($(VERSION) - 1)))..HEAD | git shortlog  >> $@
        @ echo >> $@
        @ cat $@
        @ cat $@.tmp >> $@