[PATCH] v008 release

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 340ca87f2a7b6580ae0de360697e733f1cb6772a..5c66db4697d614b0211bbfc363e132f2fef107ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DEBUG = false
 
 
 ROOT =         udev
-VERSION =      007_bk
+VERSION =      008
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 
@@ -154,6 +154,7 @@ SYSFS =     libsysfs/sysfs_bus.o    \
        libsysfs/dlist.o
 
 OBJS = udev.o          \
+       udev_config.o   \
        udev-add.o      \
        udev-remove.o   \
        udevdb.o        \
@@ -173,8 +174,12 @@ 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_CONFIG_DIR  \"$(configdir)\" >> $@
        @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\" >> $@
+       @echo \#define UDEV_PERMISSION_FILE     \"$(configdir)\udev.permissions\" >> $@
 
 $(OBJS): $(GEN_HEADERS)
 
@@ -226,7 +231,8 @@ install: all
        $(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.conf $(DESTDIR)$(configdir)
+       $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir)
        $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
        - rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
        - ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
@@ -234,7 +240,8 @@ install: all
 uninstall:
        - rm $(hotplugdir)/udev.hotplug
        - rm $(configdir)/udev.permissions
-       - rm $(configdir)/udev.config
+       - rm $(configdir)/udev.rules
+       - rm $(configdir)/udev.conf
        - rm $(mandir)/man8/udev.8
        - rm $(sbindir)/$(ROOT)
        - rmdir $(hotplugdir)