Move mount.ntfs-fuse and mkfs.ntfs to be symlinks instead of

hardlinks and move both to /sbin rather than prefix/sbin.  Note we
still obey $destdir so building packages works as well as installing
into alternate chroot / other system still works.
edge.strict_endians
antona 2005-10-07 23:01:23 +00:00
parent ff86e350bc
commit cc57c76cd5
4 changed files with 22 additions and 11 deletions

View File

@ -1,7 +1,11 @@
xx/xx/2005 - 1.12.1-WIP
08/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
- Fix hardcoded location for uninstalling mount.ntfs-fuse hardlink to
match the relocatable location for installing it. (Anton, Szaka)
- Move mount.ntfs-fuse and mkfs.ntfs to be symlinks instead of
hardlinks and move both to /sbin rather than prefix/sbin. Note we
still obey $destdir so building packages works as well as installing
into alternate chroot / other system still works.
07/10/2005 - 1.12.0 - Lots of fixes and enhancements!

View File

@ -22,7 +22,7 @@
#
AC_PREREQ(2.59)
AC_INIT([ntfsprogs],[1.12.1-WIP],[linux-ntfs-dev@lists.sourceforge.net])
AC_INIT([ntfsprogs],[1.12.1],[linux-ntfs-dev@lists.sourceforge.net])
#
# Before making a release, the LTVERSION string should be modified.
@ -155,7 +155,7 @@ esac
AC_PROG_CC
AC_PROG_GCC_TRADITIONAL
AC_PROG_INSTALL
AC_PATH_PROG(LN, ln, ln)
AC_PATH_PROG(RM, rm, rm)
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL

View File

@ -88,8 +88,8 @@ rm -rf "$RPM_BUILD_ROOT"
%defattr(-,root,root)
%doc AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO.include TODO.libntfs TODO.ntfsprogs doc/CodingStyle doc/attribute_definitions doc/attributes.txt doc/compression.txt doc/tunable_settings doc/template.c doc/template.h doc/system_files.txt doc/system_security_descriptors.txt
%{bindir}/ntfs[^m][^o]*
%{sbindir}/mk*
%{sbindir}/ntfs*
%{sbindir}/*
/sbin/mkfs.ntfs
%{mandir}/man8/mkntfs.8*
%{mandir}/man8/mkfs.ntfs.8*
%{mandir}/man8/ntfs[^m][^o]*.8*
@ -106,6 +106,7 @@ rm -rf "$RPM_BUILD_ROOT"
%{bindir}/ntfsmount*
/sbin/mount.ntfs-fuse
%{mandir}/man8/ntfsmount.8*
%{mandir}/man8/mount.ntfs-fuse.8*
%files devel
%defattr(-,root,root)

View File

@ -142,17 +142,23 @@ extras: libs $(EXTRA_PROGRAMS)
# mkfs.ntfs[.8] and mount.ntfs-fuse hard links
install-exec-hook:
$(LN) -f $(DESTDIR)$(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
$(INSTALL) -d $(DESTDIR)/sbin
$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
if ENABLE_FUSE_MODULE
$(LN) -f $(DESTDIR)$(bindir)/ntfsmount /sbin/mount.ntfs-fuse
$(LN_S) -f $(bindir)/ntfsmount $(DESTDIR)/sbin/mount.ntfs-fuse
endif
install-data-hook:
$(LN) -f $(DESTDIR)$(man8dir)/mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
$(INSTALL) -d $(DESTDIR)$(man8dir)
$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
if ENABLE_FUSE_MODULE
$(LN_S) -f ntfsmount.8 $(DESTDIR)$(man8dir)/mount.ntfs-fuse.8
endif
uninstall-local:
rm -f $(DESTDIR)$(sbindir)/mkfs.ntfs
rm -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
$(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
if ENABLE_FUSE_MODULE
rm -f $(DESTDIR)$(sbindir)/mount.ntfs-fuse
$(RM) -f $(DESTDIR)/sbin/mount.ntfs-fuse
$(RM) -f $(DESTDIR)$(man8dir)/mount.ntfs-fuse.8
endif