Skip to contentSkip to conversation

Use DESTDIR when installing mount.smb3 and optionally install man page

PATCH In review Ryan Barnett 2 participants 3 messages Apr 28, 2020 – May 11, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Use DESTDIR when installing mount.smb3 and optionally install man page

Properly create mount.smb3 symlink by using DESTDIR. Also use CONFIG_MAN to optionally install manpage for mount.smb3.

---
 Makefile.am | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Makefile.am +6 -4
index fe9cd34..e0587f1 100644
@@ -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
Signature · 1 line
2.17.1
#1 lore raw

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 <[email protected]>:

Quoted 34 lines

Properly create mount.smb3 symlink by using DESTDIR. Also use CONFIG_MAN to optionally install manpage for mount.smb3.

---
 Makefile.am | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Makefile.am +6 -5
index fe9cd34..e0587f1 100644
@@ -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

#2 lore raw

Hi Pavel,

Quoted 5 lines · Pavel Shilovsky

Hi Ryan,

Thanks for the patches.

Quoted 8 lines

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