X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=5833d4cb94c0844489c5d0c9fd4cd290fc691b33;hb=5cac7def788fc6dec19dc8185f9c2c7c7c8d49a2;hp=e599df34ada5ef178dd51c7ec0f926c8e093c317;hpb=54b72ce91eec6116f14f5fa5abefb2e6210df795;p=elogind.git

diff --git a/Makefile b/Makefile
index e599df34a..5833d4cb9 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ USE_DBUS = false
 
 
 ROOT =		udev
-VERSION =	009
+VERSION =	009_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 
@@ -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 $@ ; \
@@ -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 $@ ; \
@@ -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 $@ ; \