[PATCH] - format char for CALLOUT output

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 586db488bcb22953ce2d50a9263917cdfdd78afe..a2f904a7454a40addb70cc0ab4392f0cd525fa83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,11 @@ DEBUG = true
 
 
 ROOT =         udev
-VERSION =      005_bk
+VERSION =      006_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}
@@ -150,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
 
@@ -165,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:
@@ -177,7 +181,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)
@@ -195,14 +211,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 -f $(DESTDIR)$(hotplugdir)/udev.hotplug
+       - ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 
 uninstall:
        - rm $(hotplugdir)/udev.hotplug