Message ID | 1417357142-14307-13-git-send-email-thomas.petazzoni@free-electrons.com |
---|---|
State | Accepted |
Headers | show |
Thomas, All, On 2014-11-30 15:18 +0100, Thomas Petazzoni spake thusly: > Also use a complete destination path for the $(INSTALL) command. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > package/proftpd/proftpd.mk | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk > index ce735bd..65dd84e 100644 > --- a/package/proftpd/proftpd.mk > +++ b/package/proftpd/proftpd.mk > @@ -52,7 +52,10 @@ define PROFTPD_INSTALL_TARGET_CMDS > $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ > $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \ > fi > - $(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d > +endef > + > +define PROFTPD_INSTALL_INIT_SYSV > + $(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d/S50proftpd Missing the -D option. Regards, Yann E. MORIN. > endef > > $(eval $(autotools-package)) > -- > 2.1.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Also use a complete destination path for the $(INSTALL) command. > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed with the -D option added as noted by Yann, thanks.
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index ce735bd..65dd84e 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -52,7 +52,10 @@ define PROFTPD_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \ fi - $(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d +endef + +define PROFTPD_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d/S50proftpd endef $(eval $(autotools-package))
Also use a complete destination path for the $(INSTALL) command. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/proftpd/proftpd.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)