chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow programs in /lib/udev called without the path
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 6cc51eea0ab7281246548b27fd1538b49b8fc2b3..48a130491e172292d1c8feb69bc3db82739575e7 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-17,7
+17,7
@@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-VERSION = 07
5
+VERSION = 07
6
# set this to make use of syslog
USE_LOG = true
# set this to make use of syslog
USE_LOG = true
@@
-208,7
+208,7
@@
all: $(PROGRAMS) $(MAN_PAGES)
LIBUDEV="$(PWD)/$(LIBUDEV)" \
LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
QUIET="$(QUIET)" \
LIBUDEV="$(PWD)/$(LIBUDEV)" \
LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
QUIET="$(QUIET)" \
- -C $$target $@; \
+ -C $$target $@
|| exit 1
; \
done;
.PHONY: all
.DEFAULT: all
done;
.PHONY: all
.DEFAULT: all
@@
-250,7
+250,6
@@
udev_version.h:
@echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
@echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
@echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
@echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
- @echo \#define UDEVD_BIN \"$(sbindir)/udevd\" >> $@
# man pages
%.8: docs/%.xml
# man pages
%.8: docs/%.xml
@@
-271,7
+270,7
@@
clean:
- rm -f udev-$(VERSION).tar.gz
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- rm -f udev-$(VERSION).tar.gz
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) -C $$target $@; \
+ $(MAKE) -C $$target $@
|| exit 1
; \
done;
.PHONY: clean
done;
.PHONY: clean
@@
-293,7
+292,7
@@
install-config: $(GEN_CONFIGS)
fi
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
fi
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) -C $$target $@; \
+ $(MAKE) -C $$target $@
|| exit 1
; \
done;
.PHONY: install-config
done;
.PHONY: install-config
@@
-308,7
+307,7
@@
install-man:
- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) -C $$target $@; \
+ $(MAKE) -C $$target $@
|| exit 1
; \
done;
.PHONY: install-man
done;
.PHONY: install-man
@@
-323,7
+322,7
@@
uninstall-man:
- rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) -C $$target $@; \
+ $(MAKE) -C $$target $@
|| exit 1
; \
done;
.PHONY: uninstall-man
done;
.PHONY: uninstall-man
@@
-339,7
+338,7
@@
install-bin:
$(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
$(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) -C $$target $@; \
+ $(MAKE) -C $$target $@
|| exit 1
; \
done;
ifndef DESTDIR
- killall udevd
done;
ifndef DESTDIR
- killall udevd
@@
-363,7
+362,7
@@
ifndef DESTDIR
endif
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
endif
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) -C $$target $@; \
+ $(MAKE) -C $$target $@
|| exit 1
; \
done;
.PHONY: uninstall-bin
done;
.PHONY: uninstall-bin