chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] add IGNORE rule type
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 8b20612de089711b40dad01f4fe2d3f7f54f2504..ffd61c0400e1793ddb73e6e67707ca939368ecfc 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-26,9
+26,10
@@
USE_DBUS = false
ROOT = udev
ROOT = udev
-VERSION = 01
1
_bk
+VERSION = 01
2
_bk
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
+LOCAL_CFG_DIR = etc/udev
DESTDIR =
# override this to make udev look in a different location for it's config files
DESTDIR =
# override this to make udev look in a different location for it's config files
@@
-206,11
+207,11
@@
udev_version.h:
@echo \#define UDEV_PERMISSION_FILE \"$(configdir)\udev.permissions\" >> $@
# config files automatically generated
@echo \#define UDEV_PERMISSION_FILE \"$(configdir)\udev.permissions\" >> $@
# config files automatically generated
-GEN_CONFIGS = udev.conf
+GEN_CONFIGS =
$(LOCAL_CFG_DIR)/
udev.conf
# Rules on how to create the generated config files
# Rules on how to create the generated config files
-udev.conf:
- sed -e "s:@udevdir@:$(udevdir):" < udev.conf.in > $@
+
$(LOCAL_CFG_DIR)/
udev.conf:
+ sed -e "s:@udevdir@:$(udevdir):" <
$(LOCAL_CFG_DIR)/
udev.conf.in > $@
$(OBJS): $(GEN_HEADERS)
$(OBJS): $(GEN_HEADERS)
@@
-265,7
+266,8
@@
small_release: $(DISTFILES) clean
ifeq ($(USE_DBUS), true)
install-dbus-policy:
$(INSTALL) -d $(DESTDIR)$(dbusdir)
ifeq ($(USE_DBUS), true)
install-dbus-policy:
$(INSTALL) -d $(DESTDIR)$(dbusdir)
- $(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+ $(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+
uninstall-dbus-policy:
- rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
else
uninstall-dbus-policy:
- rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
else
@@
-278,16
+280,16
@@
endif
install-config: $(GEN_CONFIGS)
$(INSTALL) -d $(DESTDIR)$(configdir)
@if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \
install-config: $(GEN_CONFIGS)
$(INSTALL) -d $(DESTDIR)$(configdir)
@if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \
- echo $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
- $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
+ echo $(INSTALL_DATA)
$(LOCAL_CFG_DIR)/
udev.conf $(DESTDIR)$(configdir); \
+ $(INSTALL_DATA)
$(LOCAL_CFG_DIR)/
udev.conf $(DESTDIR)$(configdir); \
fi
@if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \
fi
@if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \
- echo $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir); \
- $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir); \
+ echo $(INSTALL_DATA)
$(LOCAL_CFG_DIR)/
udev.rules $(DESTDIR)$(configdir); \
+ $(INSTALL_DATA)
$(LOCAL_CFG_DIR)/
udev.rules $(DESTDIR)$(configdir); \
fi
@if [ ! -r $(DESTDIR)$(configdir)udev.permissions ]; then \
fi
@if [ ! -r $(DESTDIR)$(configdir)udev.permissions ]; then \
- echo $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir); \
- $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir); \
+ echo $(INSTALL_DATA)
$(LOCAL_CFG_DIR)/
udev.permissions $(DESTDIR)$(configdir); \
+ $(INSTALL_DATA)
$(LOCAL_CFG_DIR)/
udev.permissions $(DESTDIR)$(configdir); \
fi
fi