mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-23 17:34:00 +03:00
fix INSTALL_PROGRAM vs. INSTALL_SCRIPT
This commit is contained in:
parent
8fdad27d61
commit
86f4ea067e
4
Makefile
4
Makefile
@ -101,10 +101,10 @@ configdir = ${etcdir}/udev
|
||||
udevdir = /dev
|
||||
DESTDIR =
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
PWD = $(shell pwd)
|
||||
|
||||
CROSS_COMPILE ?=
|
||||
|
@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -17,10 +17,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
@ -37,7 +37,7 @@ clean:
|
||||
.PHONY: clean
|
||||
|
||||
install-bin: all
|
||||
$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
|
||||
$(INSTALL_SCRIPT) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
|
||||
.PHONY: install-bin
|
||||
|
||||
uninstall-bin:
|
||||
|
@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -17,10 +17,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
@ -37,7 +37,7 @@ clean:
|
||||
.PHONY: clean
|
||||
|
||||
install-bin: all
|
||||
$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
|
||||
$(INSTALL_SCRIPT) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
|
||||
.PHONY: install-bin
|
||||
|
||||
uninstall-bin:
|
||||
|
@ -17,10 +17,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
@ -37,9 +37,9 @@ clean:
|
||||
.PHONY: clean
|
||||
|
||||
install-bin: all
|
||||
$(INSTALL_PROGRAM) -D rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions
|
||||
$(INSTALL_PROGRAM) -D write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules
|
||||
$(INSTALL_PROGRAM) -D write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules
|
||||
$(INSTALL_SCRIPT) -D rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions
|
||||
$(INSTALL_SCRIPT) -D write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules
|
||||
$(INSTALL_SCRIPT) -D write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules
|
||||
$(INSTALL_DATA) -D 75-cd-aliases-generator.rules \
|
||||
$(DESTDIR)$(configdir)/rules.d/75-cd-aliases-generator.rules
|
||||
$(INSTALL_DATA) -D 75-persistent-net-generator.rules \
|
||||
|
@ -19,10 +19,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -23,10 +23,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -20,10 +20,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -18,10 +18,10 @@ libudevdir = ${prefix}/lib/udev
|
||||
mandir = ${prefix}/usr/share/man
|
||||
configdir = ${etcdir}/udev/
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
all: $(PROG) $(MAN_PAGES)
|
||||
.PHONY: all
|
||||
|
@ -8,7 +8,7 @@ includedir = ${prefix}/usr/include
|
||||
libdir = ${prefix}/lib
|
||||
usrlibdir = ${prefix}/usr/lib
|
||||
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL = install -c
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_LIB = ${INSTALL} -m 755
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user