X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=500c8db6d241b2eb22fc7bcd09e2591faa2c3844;hb=2c769419a18281ab095809cf3c37a36f0f615c01;hp=5c44571aab2a54776a949143f8f4c3ef5297851d;hpb=8531b0b9649b504c660d6fecc78d1be919153f2d;p=elogind.git

diff --git a/Makefile b/Makefile
index 5c44571aa..500c8db6d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 080
+VERSION = 081
 
 # set this to make use of syslog
 USE_LOG = true
@@ -43,7 +43,7 @@ USE_STATIC = false
 #  make EXTRAS="extras/<extra1> extras/<extra2>"
 EXTRAS =
 
-# make the build silent. Set this to something else to make it noisy again.
+# make the build silent.
 V = false
 
 PROGRAMS = \
@@ -81,7 +81,7 @@ UDEV_OBJS = \
 LIBUDEV = libudev.a
 
 MAN_PAGES = \
-	udev.8				\
+	udev.7				\
 	udevmonitor.8			\
 	udevd.8				\
 	udevsend.8			\
@@ -89,10 +89,6 @@ MAN_PAGES = \
 	udevinfo.8			\
 	udevstart.8
 
-# config files automatically generated
-GEN_CONFIGS = \
-	$(LOCAL_CFG_DIR)/udev.conf
-
 GEN_HEADERS = \
 	udev_version.h
 
@@ -105,12 +101,11 @@ libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev
 udevdir =	/dev
-LOCAL_CFG_DIR =	etc/udev
 DESTDIR =
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
+INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 PWD = $(shell pwd)
 
@@ -149,7 +144,6 @@ ifeq ($(strip $(USE_GCOV)),true)
 	LDFLAGS += -fprofile-arcs
 endif
 
-# if our own version of klibc is used, we need to build it
 ifeq ($(strip $(USE_KLIBC)),true)
 	KLCC		= /usr/bin/$(CROSS)klcc
 	CC		= $(KLCC)
@@ -211,20 +205,15 @@ $(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
 	$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
 	$(QUIET) $(RANLIB) $@
 
-# generate config files
-$(GEN_CONFIGS):
-	sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $@.in > $@
-
-# generate config header file
 udev_version.h:
-	@echo "Creating udev_version.h"
-	@echo \#define UDEV_VERSION		\"$(VERSION)\" > $@
+	@echo "/* Generated by make. */" > $@
+	@echo \#define UDEV_VERSION		\"$(VERSION)\" >> $@
 	@echo \#define UDEV_ROOT		\"$(udevdir)\" >> $@
 	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
 	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@
 
 # man pages
-%.8: docs/%.xml
+%.8 %.7: docs/%.xml
 	xmlto man $?
 .PRECIOUS: %.8
 
@@ -239,8 +228,9 @@ clean:
 	- find -name "*.gcda" -print0 | xargs -0rt rm -f
 	- find -name "*.gcov" -print0 | xargs -0rt rm -f
 	- rm -f udev_gcov.txt
-	- rm -f core $(PROGRAMS) $(GEN_HEADERS) $(GEN_CONFIGS)
+	- rm -f core $(PROGRAMS) $(GEN_HEADERS)
 	- rm -f udev-$(VERSION).tar.gz
+	- rm -f udev-$(VERSION).tar.bz2
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
 		$(MAKE) -C $$target $@ || exit 1; \
@@ -249,14 +239,13 @@ clean:
 
 release:
 	git-tar-tree HEAD udev-$(VERSION) | gzip -9v > udev-$(VERSION).tar.gz
-	@echo "udev-$(VERSION).tar.gz created"
+	git-tar-tree HEAD udev-$(VERSION) | bzip2 -9v > udev-$(VERSION).tar.bz2
 .PHONY: release
 
-install-config: $(GEN_CONFIGS)
+install-config:
 	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
 	@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
-		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
-		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
+		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
 	fi
 	@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
 		echo; \
@@ -270,7 +259,7 @@ install-config: $(GEN_CONFIGS)
 .PHONY: install-config
 
 install-man:
-	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+	$(INSTALL_DATA) -D udev.7 $(DESTDIR)$(mandir)/man7/udev.7
 	$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
 	$(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
 	$(INSTALL_DATA) -D udevstart.8 $(DESTDIR)$(mandir)/man8/udevstart.8
@@ -285,7 +274,7 @@ install-man:
 .PHONY: install-man
 
 uninstall-man:
-	- rm -f $(DESTDIR)$(mandir)/man8/udev.8
+	- rm -f $(DESTDIR)$(mandir)/man7/udev.7
 	- rm -f $(DESTDIR)$(mandir)/man8/udevinfo.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevtest.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevstart.8
@@ -327,8 +316,8 @@ uninstall-bin:
 	- rm -f $(DESTDIR)$(sbindir)/udevcontrol
 	- rm -f $(DESTDIR)$(sbindir)/udevstart
 	- rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
-	- rm -f $(usrbindir)/udevinfo
-	- rm -f $(DESTDIR)$(DESTDIR)$(usrbindir)/udevtest
+	- rm -f $(DESTDIR)$(usrbindir)/udevinfo
+	- rm -f $(DESTDIR)$(usrbindir)/udevtest
 ifndef DESTDIR
 	- killall udevd
 	- rm -rf /dev/.udev
@@ -387,4 +376,3 @@ udev_gcov.txt: $(wildcard *.gcda) $(wildcard *.gcno)
 		echo >> $@; \
 	done; \
 	echo "view $@ for the result"
-