[PATCH] DESTDIR for udev

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 82ea0bc309214713fea08ed0e6d79797f0a0526e..01536f698693c5e28b41927c9b42f3d26a4a74bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,11 @@ DEBUG = true
 
 
 ROOT =         udev
 
 
 ROOT =         udev

-VERSION =      005
+VERSION =      005_bk

 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 

+DESTDIR =

 # override this to make udev look in a different location for it's config files
 prefix =
 exec_prefix =  ${prefix}
 # override this to make udev look in a different location for it's config files
 prefix =
 exec_prefix =  ${prefix}


@@ -106,19 +107,22 @@ endif
 # If we are using our version of klibc, then we need to build and link it.
 # Otherwise, use glibc and link statically.
 ifeq ($(strip $(KLIBC)),true)
 # If we are using our version of klibc, then we need to build and link it.
 # Otherwise, use glibc and link statically.
 ifeq ($(strip $(KLIBC)),true)

-       KLIBC_DIR       = klibc
+       KLIBC_DIR       = klibc/klibc

        INCLUDE_DIR     := $(KLIBC_DIR)/include
        # arch specific objects
        INCLUDE_DIR     := $(KLIBC_DIR)/include
        # arch specific objects

+       LIBGCC          = $(shell $(CC) --print-libgcc)

        ARCH_LIB_OBJS = \
        ARCH_LIB_OBJS = \

-                       $(KLIBC_DIR)/bin-$(ARCH)/start.o        \
-                       $(KLIBC_DIR)/bin-$(ARCH)/klibc.a
+                       $(KLIBC_DIR)/libc.a     \
+                       $(LIBGCC)

 
 

-       LIB_OBJS =      $(GCC_LIB)

 
 

+       CRT0 = $(KLIBC_DIR)/crt0.o

        LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS)
        LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS)

-       CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(GCCINCDIR)
+       CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+       LIB_OBJS =

        LDFLAGS = --static --nostdlib -nostartfiles
 else
        LDFLAGS = --static --nostdlib -nostartfiles
 else

+       CRT0 =

        LIBC = 
        CFLAGS += -I$(GCCINCDIR)
        LIB_OBJS = -lc
        LIBC = 
        CFLAGS += -I$(GCCINCDIR)
        LIB_OBJS = -lc


@@ -192,14 +196,14 @@ release: $(DISTFILES) clean
 
 
 install: all
 
 
 install: all

-       $(INSTALL) -d $(udevdir)
-       $(INSTALL) -d $(configdir)
-       $(INSTALL) -d $(hotplugdir)
-       $(INSTALL_PROGRAM) -D $(ROOT) $(sbindir)/$(ROOT)
-       $(INSTALL_DATA) -D udev.8 $(mandir)/man8/udev.8
-       $(INSTALL_DATA) udev.config $(configdir)
-       $(INSTALL_DATA) udev.permissions $(configdir)
-       - ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
+       $(INSTALL) -d $(DESTDIR)$(udevdir)
+       $(INSTALL) -d $(DESTDIR)$(configdir)
+       $(INSTALL) -d $(DESTDIR)$(hotplugdir)
+       $(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
+       $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+       $(INSTALL_DATA) udev.config $(DESTDIR)$(configdir)
+       $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
+       - ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug

 
 uninstall:
        - rm $(hotplugdir)/udev.hotplug
 
 uninstall:
        - rm $(hotplugdir)/udev.hotplug