| Message ID | 20200428032647.2420-1-ryanbarnett3@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Use DESTDIR when installing mount.smb3 and optionally install man page | expand |
Hi Ryan, Thanks for the patches. I think they are duplicates of ones posted in January which I haven't merged yet: https://lists.samba.org/archive/samba-technical/2020-January/134770.html https://lists.samba.org/archive/samba-technical/2020-January/134771.html Please let me know if you would still like any additional changes on top of the two patches above. -- Best regards, Pavel Shilovsky пн, 27 апр. 2020 г. в 20:27, Ryan Barnett <ryanbarnett3@gmail.com>: > > Properly create mount.smb3 symlink by using DESTDIR. Also use > CONFIG_MAN to optionally install manpage for mount.smb3. > > Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com> > --- > Makefile.am | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index fe9cd34..e0587f1 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -119,11 +119,13 @@ endif > SUBDIRS = contrib > > install-exec-hook: > - (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) > + (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) > > +if CONFIG_MAN > install-data-hook: > - (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) > + (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) > +endif > > uninstall-hook: > - (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) > - (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) > + rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3 > + rm -f $(DESTDIR)$(man8dir)/mount.smb3.8 > -- > 2.17.1 >
Hi Pavel, On Mon, May 11, 2020 at 10:42 AM Pavel Shilovsky <piastryyy@gmail.com> wrote: > > Hi Ryan, > > Thanks for the patches. > > I think they are duplicates of ones posted in January which I haven't > merged yet: > > https://lists.samba.org/archive/samba-technical/2020-January/134770.html > https://lists.samba.org/archive/samba-technical/2020-January/134771.html > > Please let me know if you would still like any additional changes on > top of the two patches above. Yes these two patches accomplish what this patch does. Sorry I missed this while trying to submit. Thanks, -Ryan
diff --git a/Makefile.am b/Makefile.am index fe9cd34..e0587f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,11 +119,13 @@ endif SUBDIRS = contrib install-exec-hook: - (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) + (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) +if CONFIG_MAN install-data-hook: - (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) + (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) +endif uninstall-hook: - (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) - (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) + rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3 + rm -f $(DESTDIR)$(man8dir)/mount.smb3.8
Properly create mount.smb3 symlink by using DESTDIR. Also use CONFIG_MAN to optionally install manpage for mount.smb3. Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com> --- Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)