X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=d953218f7ba267a1da6418a73f7137b132d1a471;hp=784608629440ecc00a76117fbd0fdc4d7f51d81d;hb=53921bfa44129a19661a4aaa4c1647282921fc18;hpb=245f9f52cec28b0377376beec222c8d5c0d07276

diff --git a/Makefile b/Makefile
index 784608629..d953218f7 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
 HELPER =	udevinfo
-VERSION =	014_bk
+VERSION =	015_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
@@ -232,6 +232,8 @@ udev_version.h:
 	@echo \#define UDEV_CONFIG_FILE	\"$(configdir)\udev.conf\" >> $@
 	@echo \#define UDEV_RULES_FILE	\"$(configdir)\udev.rules\" >> $@
 	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)\udev.permissions\" >> $@
+	@echo \#define UDEV_BIN		\"$(PWD)/udev\" >> $@
+	@echo \#define UDEVD_BIN	\"$(PWD)/udevd\" >> $@
 
 # config files automatically generated
 GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
@@ -253,7 +255,7 @@ $(HELPER): udevinfo.o $(OBJS) $(HEADERS)
 	$(STRIPCMD) $@
 
 $(DAEMON): udevd.h udevd.o udevd.o logging.o
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(LD) $(LDFLAGS) -lpthread -o $@ $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
 $(SENDER): udevd.h udevsend.o udevd.o logging.o
@@ -263,7 +265,7 @@ $(SENDER): udevd.h udevsend.o udevd.o logging.o
 clean:
 	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
 	 | xargs rm -f 
-	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(DAEMON) $(SENDER)
+	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(HELPER) $(DAEMON) $(SENDER)
 	$(MAKE) -C klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
@@ -339,11 +341,12 @@ install: install-config install-dbus-policy all
 	$(INSTALL_PROGRAM) -D $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
 	@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; \
+		ln -s $(DESTDIR)$(initdir)/udev $(sbindir)/rcudev; \
 	else \
 		$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
 	fi
 	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+	$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
 	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
 	- ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
@@ -359,6 +362,7 @@ uninstall: uninstall-dbus-policy
 	- rm $(configdir)/udev.conf
 	- rm $(initdir)/udev
 	- rm $(mandir)/man8/udev.8
+	- rm $(mandir)/man8/udevinfo.8
 	- rm $(sbindir)/$(ROOT)
 	- rm $(sbindir)/$(HELPER)
 	- rmdir $(hotplugdir)