X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=80c4908ccb05b0b3119941d1b48d0b04b8fc1787;hp=b27f1b92d9234a5dee1c39d032446134a197d625;hb=78812b99d371f362bb0e0eb1c111a8a7adffe48f;hpb=6d88260a8be069a65ab52fa924e6d4dc13c4e83c

diff --git a/Makefile b/Makefile
index b27f1b92d..80c4908cc 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ USE_DBUS = false
 
 
 ROOT =		udev
-VERSION =	011_bk
+VERSION =	013_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
@@ -61,7 +61,7 @@ udevdir = ${prefix}/udev
 #USE_KLIBC = true
 
 # If you are running a cross compiler, you may want to set this
-# to something more interesting, like "arm-linux-".  I you want
+# to something more interesting, like "arm-linux-".  If you want
 # to compile vs uClibc, that can be done here as well.
 CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
 CC = $(CROSS)gcc
@@ -133,7 +133,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	LIBC =	$(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
 	CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(KLIBC_DIR)/arch/$(ARCH)/include \
 		-I$(INCLUDE_DIR)/bits$(BITSIZE) -I$(GCCINCDIR) -I$(LINUX_INCLUDE_DIR) \
-		-D__KLIBC__
+		-D__KLIBC__ -fno-builtin-printf
 	LIB_OBJS =
 	LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
 else
@@ -231,7 +231,7 @@ clean:
 			-C $$target $@ ; \
 	done ; \
 
-DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb" | grep -v "test\/sys" | sort )
+DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
 release: clean
@@ -266,7 +266,8 @@ small_release: $(DISTFILES) clean
 ifeq ($(USE_DBUS), true)
 install-dbus-policy:
 	$(INSTALL) -d $(DESTDIR)$(dbusdir)
-	$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+	$(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+
 uninstall-dbus-policy:
 	- rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
 else
@@ -291,13 +292,16 @@ install-config: $(GEN_CONFIGS)
 		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
 	fi
 
-
-
 install: install-config install-dbus-policy all
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
 	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
 	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
-	$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev
+	@if [ "x$(USE_LSB)" = "xtrue" ]; then \
+		$(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
+		ln -s $(DESTDIR)$(initdir)/udev $(sbin_dir)/rcudev; \
+	else \
+		$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
+	fi
 	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
 	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
 	- ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
@@ -323,5 +327,3 @@ uninstall: uninstall-dbus-policy
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
 			-C $$target $@ ; \
 	done ; \
-
-