chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use proper directory lib/lib64 for libvolume_id
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 075389b6ead1c9aba809459ccd59460a11f75617..8b391a01fc5b3fa79d5e088403bc08ca11e0157d 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-16,7
+16,7
@@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
-VERSION = 12
4
+VERSION = 12
5
# set this to make use of syslog
USE_LOG = true
# set this to make use of syslog
USE_LOG = true
@@
-190,9
+190,7
@@
udev_version.h:
$(E) " GENHDR " $@
$(Q) echo "/* Generated by make. */" > $@
$(Q) echo \#define UDEV_VERSION \"$(VERSION)\" >> $@
$(E) " GENHDR " $@
$(Q) echo "/* Generated by make. */" > $@
$(Q) echo \#define UDEV_VERSION \"$(VERSION)\" >> $@
- $(Q) echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
$(Q) echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
$(Q) echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
- $(Q) echo \#define UDEV_RULES_DIR \"$(configdir)/rules.d\" >> $@
# man pages
%.8 %.7: %.xml
# man pages
%.8 %.7: %.xml
@@
-220,15
+218,12
@@
clean:
.PHONY: clean
install-config:
.PHONY: clean
install-config:
+ $(INSTALL) -d $(DESTDIR)$(libudevdir)/rules.d
$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
- $(INSTALL_DATA)
etc/udev/
udev.conf $(DESTDIR)$(configdir); \
+ $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
fi
fi
- @ for i in etc/udev/rules.d/*.rules; do \
- if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$(basename $$i) ]; then \
- $(INSTALL_DATA) $$i $(DESTDIR)$(configdir)/rules.d; \
- fi \
- done
+ cp rules/rules.d/* $(DESTDIR)$(libudevdir)/rules.d
@ extras="$(EXTRAS)"; for target in $$extras; do \
$(MAKE) -C $$target $@ || exit 1; \
done;
@ extras="$(EXTRAS)"; for target in $$extras; do \
$(MAKE) -C $$target $@ || exit 1; \
done;