X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=cd539eeb74f6a6e19d7fdca60331ac34e3921e39;hb=4b710f033e86c72dbcae345564257f3ecce9941b;hp=96037e486d13178f99d40b290eb667bfaa0f130f;hpb=c94705b5648499c58b32099dc3a303b64e1de603;p=elogind.git

diff --git a/Makefile b/Makefile
index 96037e486..cd539eeb7 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,11 @@ DEBUG = true
 
 
 ROOT =		udev
-VERSION =	004_bk
+VERSION =	005_bk
 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}
@@ -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)
-	KLIBC_DIR	= klibc
+	KLIBC_DIR	= klibc/klibc
 	INCLUDE_DIR	:= $(KLIBC_DIR)/include
 	# arch specific objects
+	LIBGCC		= $(shell $(CC) --print-libgcc)
 	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)
-	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
+	CRT0 =
 	LIBC = 
 	CFLAGS += -I$(GCCINCDIR)
 	LIB_OBJS = -lc
@@ -174,7 +178,19 @@ clean:
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb" | grep -v "test\/sys" | sort )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
-release: $(DISTFILES) clean
+release: clean
+	@echo "--------------------------cut here------------------------"
+	@echo "cd .."
+	@echo "rm -rf $(DISTDIR)"
+	@echo "mkdir $(DISTDIR)"
+	@echo "chmod 777 $(DISTDIR)"
+	@echo "cp -avr udev/* $(DISTDIR)"
+	@echo "tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz"
+	@echo "rm -rf $(DISTDIR)"
+	@echo "--------------------------cut here------------------------"
+
+
+small_release: $(DISTFILES) clean
 #	@echo $(DISTFILES)
 	@-rm -rf $(DISTDIR)
 	@mkdir $(DISTDIR)
@@ -192,14 +208,15 @@ release: $(DISTFILES) clean
 
 
 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)
+	- rm $(DESTDIR)$(hotplugdir)/udev.hotplug
+	- ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 
 uninstall:
 	- rm $(hotplugdir)/udev.hotplug