summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorolh@suse.de <olh@suse.de>2003-12-11 08:00:40 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:07 -0700
commit18a0d6522d06338c76d7706f4a246a37e232f31c (patch)
treec33e26b3b3a8586585f78cc0a99c507b232af5e3 /Makefile
parent525d07e78e281f5034ee29d2cd5cc144fe320431 (diff)
[PATCH] use udevdir in udev.conf
udevdir is a define, but udev.conf has a hardcoded path. Maybe this config file should be generated on the fly, like shown below.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 51087bc8c6..cdee7ac812 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
EXTRAS=
# place to put our device nodes
-udevdir = ${prefix}/udev/
+udevdir = ${prefix}/udev
# Comment out this line to build with something other
# than the local version of klibc
@@ -196,8 +196,8 @@ GEN_HEADERS = udev_version.h
# Rules on how to create the generated header files
udev_version.h:
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
- @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
- @echo \#define UDEV_DB \"$(udevdir)\.udev.tdb\" >> $@
+ @echo \#define UDEV_ROOT \"$(udevdir)/\" >> $@
+ @echo \#define UDEV_DB \"$(udevdir)/\.udev.tdb\" >> $@
@echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@
@echo \#define UDEV_CONFIG_FILE \"$(configdir)\udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)\udev.rules\" >> $@
@@ -212,7 +212,7 @@ $(ROOT): $(OBJS)
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
- -rm -f core $(ROOT) $(GEN_HEADERS)
+ -rm -f core $(ROOT) $(GEN_HEADERS) udev.conf
$(MAKE) -C klibc clean
@for target in $(EXTRAS) ; do \
echo $$target ; \
@@ -271,6 +271,7 @@ install: install-dbus-policy all
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+ sed -e "s-@udevdir@-$(udevdir)-" < udev.conf.in > udev.conf
$(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir)
$(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir)
$(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)