[PATCH] add IGNORE rule type

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 3e220b47d0da44f5bc571d4cbceb0ab85ba6551a..ffd61c0400e1793ddb73e6e67707ca939368ecfc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,10 @@ USE_DBUS = false
 
 
 ROOT =         udev
-VERSION =      009_bk
+VERSION =      012_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
+LOCAL_CFG_DIR =        etc/udev
 
 DESTDIR =
 # override this to make udev look in a different location for it's config files
@@ -114,8 +115,9 @@ else
        STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
 
-# If we are using our version of klibc, then we need to build and link it.
-# Otherwise, use glibc and link statically.
+# If we are using our version of klibc, then we need to build, link it, and then
+# link udev against it statically.
+# Otherwise, use glibc and link dynamically.
 ifeq ($(strip $(USE_KLIBC)),true)
        KLIBC_BASE      = $(PWD)/klibc
        KLIBC_DIR       = $(KLIBC_BASE)/klibc
@@ -139,7 +141,7 @@ else
        LIBC = 
        CFLAGS += -I$(GCCINCDIR)
        LIB_OBJS = -lc
-       LDFLAGS = --static 
+       LDFLAGS =
 endif
 
 CFLAGS += -I$(PWD)/libsysfs
@@ -205,16 +207,16 @@ udev_version.h:
        @echo \#define UDEV_PERMISSION_FILE     \"$(configdir)\udev.permissions\" >> $@
 
 # config files automatically generated
-GEN_CONFIGS =  udev.conf
+GEN_CONFIGS =  $(LOCAL_CFG_DIR)/udev.conf
 
 # Rules on how to create the generated config files
-udev.conf:
-       sed -e "s-@udevdir@-$(udevdir)-" < udev.conf.in > $@
+$(LOCAL_CFG_DIR)/udev.conf:
+       sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
 
 $(OBJS): $(GEN_HEADERS)
 
-$(ROOT): $(OBJS)
+$(ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixups.h list.h
        $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
@@ -264,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
@@ -277,16 +280,16 @@ endif
 install-config: $(GEN_CONFIGS)
        $(INSTALL) -d $(DESTDIR)$(configdir)
        @if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \
-               echo $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
-               $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
+               echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
+               $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
        fi
        @if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \
-               echo $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir); \
-               $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir); \
+               echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
+               $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
        fi
        @if [ ! -r $(DESTDIR)$(configdir)udev.permissions ]; then \
-               echo $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir); \
-               $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir); \
+               echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
+               $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
        fi