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] fix stroul endptr use
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index d58569f5815d900230d9130d4ca650b943782ff4..c315d099ef3294a1c1a16cc396fde3e6e668fd04 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-35,7
+35,7
@@
DAEMON = udevd
SENDER = udevsend
HELPER = udevinfo
TESTER = udevtest
SENDER = udevsend
HELPER = udevinfo
TESTER = udevtest
-VERSION = 01
8
_bk
+VERSION = 01
9
_bk
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
@@
-227,6
+227,14
@@
ifeq ($(USE_DBUS), true)
OBJS += udev_dbus.o
endif
OBJS += udev_dbus.o
endif
+# if USE_SELINUX is enabled, then we do not strip or optimize
+ifeq ($(strip $(USE_SELINUX)),true)
+ CFLAGS += -DUSE_SELINUX
+ OBJS += udev_selinux.o
+ LIB_OBJS += -lselinux
+endif
+
+
# header files automatically generated
GEN_HEADERS = udev_version.h
# header files automatically generated
GEN_HEADERS = udev_version.h
@@
-365,10
+373,12
@@
install: install-config install-dbus-policy all
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
- - ln -f -s ./udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
- - rm -f $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
- - rm -f $(DESTDIR)$(udevdir)/.udev.tdb
+ - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
+ifndef DESTDIR
+ - killall udevd
+ - rm -f $(udevdir)/.udev.tdb
+endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \