From: Kay Sievers <kay.sievers@suse.de>
Date: Sun, 5 Jun 2005 02:48:09 +0000 (+0200)
Subject: Makefile: fix DESTDIR
X-Git-Tag: 059~13^2~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1682c8c4a3909f9d80f17544bcfc6fb73379bc7e

Makefile: fix DESTDIR

Patch from: Vassilis Virvilis <vasvir@iit.demokritos.gr>

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
---

diff --git a/Makefile b/Makefile
index 2a832f705..1cf3e54fb 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,6 @@ INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
 VERSION =	058
-INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
 DESTDIR =
@@ -180,7 +179,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	KLCC		= $(KLIBC_INSTALL)/bin/klcc
 	CC		= $(KLCC)
 	LD		= $(KLCC)
-	LDFLAGS		+= -static
 else
 	CFLAGS		+= -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 endif
@@ -252,8 +250,8 @@ udev_version.h:
 	@echo \#define UDEV_CONFIG_DIR		\"$(configdir)\" >> $@
 	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
 	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@
-	@echo \#define UDEV_BIN			\"$(DESTDIR)$(sbindir)/udev\" >> $@
-	@echo \#define UDEVD_BIN		\"$(DESTDIR)$(sbindir)/udevd\" >> $@
+	@echo \#define UDEV_BIN			\"$(sbindir)/udev\" >> $@
+	@echo \#define UDEVD_BIN		\"$(sbindir)/udevd\" >> $@
 
 # Rules on how to create the generated config files
 $(LOCAL_CFG_DIR)/udev.conf: