| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 1 | From 33f678bf74367aab8ddc2858a9f7797455ea9b9f Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Thu, 29 Aug 2019 10:21:58 +0800 |
| 4 | Subject: [PATCH] Make build support usrmerge |
| 5 | |
| 6 | Upstream-Status: Inappropriate[oe-specific] |
| 7 | |
| 8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 9 | --- |
| 10 | ntfsprogs/Makefile.am | 2 -- |
| 11 | src/Makefile.am | 3 --- |
| 12 | 2 files changed, 5 deletions(-) |
| 13 | |
| 14 | diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am |
| 15 | index f4f9d1b..1f6a673 100644 |
| 16 | --- a/ntfsprogs/Makefile.am |
| 17 | +++ b/ntfsprogs/Makefile.am |
| 18 | @@ -165,8 +165,6 @@ extras: libs $(EXTRA_PROGRAMS) |
| 19 | |
| 20 | if ENABLE_MOUNT_HELPER |
| 21 | install-exec-hook: |
| 22 | - $(INSTALL) -d $(DESTDIR)/sbin |
| 23 | - $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs |
| 24 | |
| 25 | install-data-hook: |
| 26 | $(INSTALL) -d $(DESTDIR)$(man8dir) |
| 27 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 28 | index 8d98408..d0a6a45 100644 |
| 29 | --- a/src/Makefile.am |
| 30 | +++ b/src/Makefile.am |
| 31 | @@ -66,9 +66,6 @@ endif |
| 32 | |
| 33 | if ENABLE_MOUNT_HELPER |
| 34 | install-exec-local: install-rootbinPROGRAMS |
| 35 | - $(MKDIR_P) "$(DESTDIR)/sbin" |
| 36 | - $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g" |
| 37 | - $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" |
| 38 | |
| 39 | install-data-local: install-man8 |
| 40 | $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" |
| 41 | -- |
| 42 | 2.7.4 |
| 43 | |