[PATCH] v010 release

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 4a545db9c49492b84988aa65427d4a24f4ff4ffd..785ad96349003f6da4b8a741d050fc3f004b6d70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,11 @@ DEBUG = false
 
 # Set the following to `true' to make udev emit a D-BUS signal when a
 # new node is created.
-DBUS = false
+USE_DBUS = false
 
 
 ROOT =         udev
-VERSION =      008_bk
+VERSION =      010
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 
@@ -57,7 +57,7 @@ udevdir = ${prefix}/udev
 
 # Comment out this line to build with something other 
 # than the local version of klibc
-#KLIBC = true
+#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
@@ -116,7 +116,7 @@ endif
 
 # If we are using our version of klibc, then we need to build and link it.
 # Otherwise, use glibc and link statically.
-ifeq ($(strip $(KLIBC)),true)
+ifeq ($(strip $(USE_KLIBC)),true)
        KLIBC_BASE      = $(PWD)/klibc
        KLIBC_DIR       = $(KLIBC_BASE)/klibc
        INCLUDE_DIR     := $(KLIBC_DIR)/include
@@ -145,7 +145,7 @@ endif
 CFLAGS += -I$(PWD)/libsysfs
 
 all: $(ROOT)
-       @for target in $(EXTRAS) ; do \
+       @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
                        -C $$target $@ ; \
@@ -180,11 +180,11 @@ OBJS =    udev.o          \
        $(SYSFS)        \
        $(TDB)
 
-ifeq ($(strip $(KLIBC)),true)
+ifeq ($(strip $(USE_KLIBC)),true)
        OBJS += klibc_fixups.o
 endif
 
-ifeq ($(DBUS), true)
+ifeq ($(USE_DBUS), true)
        CFLAGS += -DUSE_DBUS
        CFLAGS += $(shell pkg-config --cflags dbus-1)
        LDFLAGS += $(shell pkg-config --libs dbus-1)
@@ -214,7 +214,7 @@ udev.conf:
 
 $(OBJS): $(GEN_HEADERS)
 
-$(ROOT): $(OBJS)
+$(ROOT): $(OBJS) udev.h namedev.h
        $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
@@ -223,7 +223,7 @@ clean:
         | xargs rm -f 
        -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS)
        $(MAKE) -C klibc clean
-       @for target in $(EXTRAS) ; do \
+       @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
                        -C $$target $@ ; \
@@ -261,7 +261,7 @@ small_release: $(DISTFILES) clean
        @echo "Built $(RELEASE_NAME).tar.gz"
 
 
-ifeq ($(DBUS), true)
+ifeq ($(USE_DBUS), true)
 install-dbus-policy:
        $(INSTALL) -d $(DESTDIR)$(dbusdir)
        $(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
@@ -274,19 +274,32 @@ uninstall-dbus-policy:
        -
 endif
 
-install: install-dbus-policy all $(GEN_CONFIGS)
-       $(INSTALL) -d $(DESTDIR)$(udevdir)
+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); \
+       fi
+       @if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \
+               echo $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir); \
+               $(INSTALL_DATA) 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); \
+       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
        $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
-       $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir)
-       $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir)
-       $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
        - rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
-       - ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
-       @for target in $(EXTRAS) ; do \
+       - ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
+       @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
                        -C $$target $@ ; \
@@ -303,7 +316,7 @@ uninstall: uninstall-dbus-policy
        - rmdir $(hotplugdir)
        - rmdir $(configdir)
        - rmdir $(udevdir)
-       @for target in $(EXTRAS) ; do \
+       @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
                        -C $$target $@ ; \