[PATCH] v025 release

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 01fb2a4486e2963a1c5d1a1452cdc9e81296f817..7969c0f51dc54df6fd1c8883444ebf329cfb3d6e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ INFO =                udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
 RULER =                udevruler
-VERSION =      023_bk
+VERSION =      025
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -92,7 +92,7 @@ ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sp
        -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
 
 # code taken from uClibc to determine the gcc include dir
-GCCINCDIR := ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
+GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
 
 # code taken from uClibc to determine the libgcc.a filename
 GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
@@ -246,8 +246,8 @@ GEN_CONFIGS =       $(LOCAL_CFG_DIR)/udev.conf
 $(LOCAL_CFG_DIR)/udev.conf:
        sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
-GEN_MANPAGES   = udev.8    udevd.8    udevinfo.8    udevstart.8    udevtest.8
-GEN_MANPAGESIN = udev.8.in udevd.8.in udevinfo.8.in udevstart.8.in udevtest.8.in
+GEN_MANPAGES   = udev.8
+GEN_MANPAGESIN = udev.8.in
 # Rules on how to create the man pages
 $(GEN_MANPAGES): $(GEN_MANPAGESIN)
        sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
@@ -261,7 +261,7 @@ $(DAEMON).o: $(GEN_HEADERS)
 $(SENDER).o: $(GEN_HEADERS)
 $(STARTER).o: $(GEN_HEADERS)
 
-$(ROOT): $(ROOT).o $(OBJS) $(HEADERS) $(LIBC)
+$(ROOT): $(ROOT).o $(OBJS) $(HEADERS) $(LIBC) $(GEN_MANPAGES)
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
@@ -368,7 +368,7 @@ uninstall-dev.d:
        - rmdir $(dev_ddir)default
        - rmdir $(dev_ddir)
 
-install-man: $(GEN_MANPAGES)
+install-man:
        $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
        $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
        $(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8