mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-06-14 21:34:04 +02:00
Sergey Trofimov
11131ac629
* gnu/packages/patches/ntfs-3g-autoconf-sbin-helpers.patch: New patch. * gnu/packages/patches/ntfs-3g-consistent-sbindir-usage.patch: New patch. * gnu/local.mk: Register new patches. * gnu/packages/linux.scm (ntfs-3g): Build from git. [source]: Use git-fetch. <snippet>: Remove. <patches>: Add new patches. [arguments]<#:configure-flags>: Add --with-modprobe-helper. [native-inputs]: Add autoconf, automake, libtool. [inputs]: Add kmod. [properties]: Remove release-monitoring-url and upstream-name. * gnu/packages/linux.scm (ntfs-3g-static): Gexpify arguments. Merges guix/guix!8666 Change-Id: I391d31d9b161e5f7840b4be474b9538ae053d320 Signed-off-by: Cayetano Santos <csantosb@inventati.org>
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From https://github.com/tuxera/ntfs-3g/pull/39
|
|
|
|
diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
|
|
index 08228322..a390d8c7 100644
|
|
--- a/ntfsprogs/Makefile.am
|
|
+++ b/ntfsprogs/Makefile.am
|
|
@@ -165,7 +165,7 @@ extras: libs $(EXTRA_PROGRAMS)
|
|
|
|
if ENABLE_MOUNT_HELPER
|
|
install-exec-hook:
|
|
- $(INSTALL) -d $(DESTDIR)/$(sbindir)
|
|
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
|
|
$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
|
|
|
|
install-data-hook:
|
|
@@ -173,7 +173,7 @@ install-data-hook:
|
|
$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
|
|
|
|
uninstall-local:
|
|
- $(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
|
|
+ $(RM) -f $(DESTDIR)$(sbindir)/mkfs.ntfs
|
|
$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
|
|
endif
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 8d984083..ea407067 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -66,9 +66,9 @@ endif
|
|
|
|
if ENABLE_MOUNT_HELPER
|
|
install-exec-local: install-rootbinPROGRAMS
|
|
- $(MKDIR_P) "$(DESTDIR)/sbin"
|
|
- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
|
|
- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
|
|
+ $(MKDIR_P) "$(DESTDIR)$(rootsbindir)"
|
|
+ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g"
|
|
+ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
|
|
|
|
install-data-local: install-man8
|
|
$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
|
|
@@ -76,7 +76,7 @@ install-data-local: install-man8
|
|
|
|
uninstall-local:
|
|
$(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
|
|
- $(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
|
|
+ $(RM) -f "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
|
|
endif
|
|
|
|
endif # ENABLE_NTFS_3G
|