X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=a2f904a7454a40addb70cc0ab4392f0cd525fa83;hp=cd539eeb74f6a6e19d7fdca60331ac34e3921e39;hb=c124eafa238b34a2e79100d3eb1fb143b7e8cb8b;hpb=baa936855ece1b8ce0343c7c38b7d12b0a34455c

diff --git a/Makefile b/Makefile
index cd539eeb7..a2f904a74 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DEBUG = true
 
 
 ROOT =		udev
-VERSION =	005_bk
+VERSION =	006_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 
@@ -151,10 +151,13 @@ OBJS =	udev.o		\
 	udevdb.o	\
 	logging.o	\
 	namedev.o	\
-	klibc_fixups.o	\
 	$(SYSFS)	\
 	$(TDB)
 
+ifeq ($(strip $(KLIBC)),true)
+	OBJS += klibc_fixups.o
+endif
+
 # header files automatically generated
 GEN_HEADERS =	udev_version.h
 
@@ -166,7 +169,7 @@ udev_version.h:
 
 
 $(ROOT): $(GEN_HEADERS) $(OBJS)
-	$(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(CC) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $(ROOT)
 
 clean:
@@ -215,7 +218,7 @@ install: all
 	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
 	$(INSTALL_DATA) udev.config $(DESTDIR)$(configdir)
 	$(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
-	- rm $(DESTDIR)$(hotplugdir)/udev.hotplug
+	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
 	- ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 
 uninstall: