]> err.no Git - systemd/commitdiff
Makefile: fix DESTDIR
authorKay Sievers <kay.sievers@suse.de>
Sun, 5 Jun 2005 02:48:09 +0000 (04:48 +0200)
committerKay Sievers <kay.sievers@suse.de>
Sun, 5 Jun 2005 02:48:09 +0000 (04:48 +0200)
Patch from: Vassilis Virvilis <vasvir@iit.demokritos.gr>

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

index 2a832f70545dc339dc130506c21bf21e282f876f..1cf3e54fb725afde4f4a3d385c3758cc28a992d1 100644 (file)
--- 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: