diff --git a/README b/README index 752b0231..fb648de0 100644 --- a/README +++ b/README @@ -45,7 +45,7 @@ NTFS Gnome VFS module The Gnome virtual filesystem provides universal access to diffent filesystems. This modules enables Gnome VFS clients to seamlessly utilize the NTFS library. For further details and examples of how to make use of the NTFS Gnome VFS -module in practice see man 8 ntfsgnomevfs. +module in practice see man 8 libntfs-gnomevfs. NTFS utilities ============== diff --git a/configure b/configure index cfabf75c..1fdf6a9e 100755 --- a/configure +++ b/configure @@ -12182,7 +12182,7 @@ done # Makefiles to be created by configure. - ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile libntfs/Makefile libntfs/libntfs.conf ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec" + ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12758,6 +12758,7 @@ do "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "libntfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libntfs/Makefile" ;; "libntfs/libntfs.conf" ) CONFIG_FILES="$CONFIG_FILES libntfs/libntfs.conf" ;; + "libntfs/libntfs-gnomevfs.8" ) CONFIG_FILES="$CONFIG_FILES libntfs/libntfs-gnomevfs.8" ;; "ntfsprogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/Makefile" ;; "ntfsprogs/mkntfs.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/mkntfs.8" ;; "ntfsprogs/ntfscat.8" ) CONFIG_FILES="$CONFIG_FILES ntfsprogs/ntfscat.8" ;; diff --git a/configure.ac b/configure.ac index 8767e496..83edb4af 100644 --- a/configure.ac +++ b/configure.ac @@ -179,6 +179,7 @@ AC_CONFIG_FILES([ include/Makefile libntfs/Makefile libntfs/libntfs.conf + libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 diff --git a/libntfs/Makefile.am b/libntfs/Makefile.am index c7c49d3f..851b3da2 100644 --- a/libntfs/Makefile.am +++ b/libntfs/Makefile.am @@ -76,6 +76,8 @@ libntfs_gnomevfs_la_SOURCES = \ gnomevfsmodulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules gnomevfsmodulesconf_DATA = libntfs.conf +man_MANS = libntfs-gnomevfs.8 + INCLUDES = $(linux_ntfsincludedir) $(all_includes) EXTRA_DIST = unix_io.c win32_io.c libntfs.conf.in diff --git a/libntfs/Makefile.in b/libntfs/Makefile.in index ffae640e..af8182ed 100644 --- a/libntfs/Makefile.in +++ b/libntfs/Makefile.in @@ -173,13 +173,15 @@ libntfs_gnomevfs_la_SOURCES = \ gnomevfsmodulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules gnomevfsmodulesconf_DATA = libntfs.conf +man_MANS = libntfs-gnomevfs.8 + INCLUDES = $(linux_ntfsincludedir) $(all_includes) EXTRA_DIST = unix_io.c win32_io.c libntfs.conf.in subdir = libntfs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = libntfs.conf +CONFIG_CLEAN_FILES = libntfs.conf libntfs-gnomevfs.8 LTLIBRARIES = $(gnomevfsmoduleslib_LTLIBRARIES) $(lib_LTLIBRARIES) libntfs_gnomevfs_la_DEPENDENCIES = libntfs.la @@ -213,9 +215,13 @@ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libntfs_gnomevfs_la_SOURCES) $(libntfs_la_SOURCES) + +NROFF = nroff +MANS = $(man_MANS) DATA = $(gnomevfsmodulesconf_DATA) -DIST_COMMON = Makefile.am Makefile.in libntfs.conf.in +DIST_COMMON = Makefile.am Makefile.in libntfs-gnomevfs.8.in \ + libntfs.conf.in SOURCES = $(libntfs_gnomevfs_la_SOURCES) $(libntfs_la_SOURCES) all: all-am @@ -229,6 +235,8 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.s cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libntfs.conf: $(top_builddir)/config.status libntfs.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +libntfs-gnomevfs.8: $(top_builddir)/config.status libntfs-gnomevfs.8.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ gnomevfsmoduleslibLTLIBRARIES_INSTALL = $(INSTALL) install-gnomevfsmoduleslibLTLIBRARIES: $(gnomevfsmoduleslib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -345,6 +353,49 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: + +man8dir = $(mandir)/man8 +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man8dir) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ + rm -f $(DESTDIR)$(man8dir)/$$inst; \ + done gnomevfsmodulesconfDATA_INSTALL = $(INSTALL_DATA) install-gnomevfsmodulesconfDATA: $(gnomevfsmodulesconf_DATA) @$(NORMAL_INSTALL) @@ -427,10 +478,10 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) +all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) installdirs: - $(mkinstalldirs) $(DESTDIR)$(gnomevfsmoduleslibdir) $(DESTDIR)$(libdir) $(DESTDIR)$(gnomevfsmodulesconfdir) + $(mkinstalldirs) $(DESTDIR)$(gnomevfsmoduleslibdir) $(DESTDIR)$(libdir) $(DESTDIR)$(man8dir) $(DESTDIR)$(gnomevfsmodulesconfdir) install: install-am install-exec: install-exec-am @@ -475,13 +526,13 @@ info: info-am info-am: install-data-am: install-gnomevfsmodulesconfDATA \ - install-gnomevfsmoduleslibLTLIBRARIES + install-gnomevfsmoduleslibLTLIBRARIES install-man install-exec-am: install-libLTLIBRARIES install-info: install-info-am -install-man: +install-man: install-man8 installcheck-am: @@ -496,7 +547,9 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ uninstall-am: uninstall-gnomevfsmodulesconfDATA \ uninstall-gnomevfsmoduleslibLTLIBRARIES uninstall-info-am \ - uninstall-libLTLIBRARIES + uninstall-libLTLIBRARIES uninstall-man + +uninstall-man: uninstall-man8 .PHONY: GTAGS all all-am check check-am clean clean-generic \ clean-gnomevfsmoduleslibLTLIBRARIES clean-libLTLIBRARIES \ @@ -506,13 +559,13 @@ uninstall-am: uninstall-gnomevfsmodulesconfDATA \ install-data-am install-exec install-exec-am \ install-gnomevfsmodulesconfDATA \ install-gnomevfsmoduleslibLTLIBRARIES install-info \ - install-info-am install-libLTLIBRARIES install-man \ + install-info-am install-libLTLIBRARIES install-man install-man8 \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ tags uninstall uninstall-am uninstall-gnomevfsmodulesconfDATA \ uninstall-gnomevfsmoduleslibLTLIBRARIES uninstall-info-am \ - uninstall-libLTLIBRARIES + uninstall-libLTLIBRARIES uninstall-man uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/ntfsprogs/mkntfs.8.in b/ntfsprogs/mkntfs.8.in index 5edbf57d..e97d8ede 100644 --- a/ntfsprogs/mkntfs.8.in +++ b/ntfsprogs/mkntfs.8.in @@ -225,6 +225,6 @@ is part of the Linux-NTFS project and is available for download from http://sf.net/project/showfiles.php?group_id=13956 in source (tar ball and rpm) and pre-compiled binary (i386 rpm and deb) form. .SH SEE ALSO -.BR badblocks(8), +.BR badblocks (8), .BR ntfsprogs (8) diff --git a/ntfsprogs/ntfsinfo.8.in b/ntfsprogs/ntfsinfo.8.in index 96401269..2e03b3dd 100644 --- a/ntfsprogs/ntfsinfo.8.in +++ b/ntfsprogs/ntfsinfo.8.in @@ -24,4 +24,3 @@ http://linux-ntfs.sourceforge.net/. .SH SEE ALSO .BR ntfsprogs (8) - diff --git a/ntfsprogs/ntfsprogs.8.in b/ntfsprogs/ntfsprogs.8.in index 3529a997..e72fbb89 100644 --- a/ntfsprogs/ntfsprogs.8.in +++ b/ntfsprogs/ntfsprogs.8.in @@ -65,4 +65,6 @@ can be downloaded from http://linux-ntfs.sourceforge.net/downloads.html .br These manual pages can be viewed online at http://linux-ntfs.sourceforge.net/man/ntfsprogs.html +.SH SEE ALSO +.BR libntfs-gnomevfs (8)