diff --git a/Makefile.am b/Makefile.am index 6d89e57a..aa18c413 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -SUBDIRS = src +SUBDIRS = src man EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.sh \ progsreiserfs-journal.patch progsreiserfs-file-read.patch \ darwin/readme_mac_powerpc.txt darwin/readme_mac_intel.txt \ - doc_src/testdisk.8.in doc_src/photorec.8.in doc_src/fidentify.8.in documentation.html \ + documentation.html \ dos/readme.txt \ ico/photorec.ico ico/testdisk.ico \ linux/testdisk.spec.in \ @@ -25,14 +25,12 @@ EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.s AUTOMAKE_OPTIONS = gnits -man_MANS = doc_src/testdisk.8 doc_src/photorec.8 doc_src/fidentify.8 - install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION) - $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog $(top_srcdir)/NEWS $(top_srcdir)/README $(top_srcdir)/THANKS $(top_srcdir)/documentation.html $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/ + $(mkinstalldirs) $(DESTDIR)$(docdir) + $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog $(top_srcdir)/NEWS $(top_srcdir)/README $(top_srcdir)/THANKS $(top_srcdir)/documentation.html $(DESTDIR)$(docdir) uninstall-hook: - rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION) + rm -rf $(DESTDIR)$(docdir) static: rm -f src/testdisk src/testdisk.exe src/photorec src/photorec.exe src/fidentify src/fidentify.exe src/qphotorec src/qphotorec.exe @@ -46,7 +44,6 @@ extras: (cd src && $(MAKE) extras) || exit 1; extrasstatic: -# rm -f src/fidentify src/fidentify.exe $(MAKE) LDFLAGS="$(LDFLAGS) -static" LIBS="$(PTHREAD_LIBS) $(LIBS)" CFLAGS="$(PTHREAD_CFLAGS) $(CFLAGS)" CXXFLAGS="$(PTHREAD_CFLAGS) $(CXXFLAGS)" extras DISTCLEANFILES = *~ core diff --git a/configure.ac b/configure.ac index a4cc2f70..4d54612f 100644 --- a/configure.ac +++ b/configure.ac @@ -878,5 +878,13 @@ AC_SUBST(photorec_LDADD) AC_SUBST(photorecf_LDADD) AC_SUBST(qphotorec_LDADD) AC_SUBST(qphotorec_CXXFLAGS) -AC_CONFIG_FILES([Makefile src/Makefile linux/testdisk.spec doc_src/testdisk.8 doc_src/photorec.8 doc_src/fidentify.8]) +AC_CONFIG_FILES([ + Makefile + src/Makefile + man/Makefile + man/testdisk.8 man/photorec.8 man/fidentify.8 + man/zh_CN/Makefile + man/zh_CN/testdisk.8 man/zh_CN/photorec.8 man/zh_CN/fidentify.8 + linux/testdisk.spec +]) AC_OUTPUT diff --git a/linux/testdisk.spec.in b/linux/testdisk.spec.in index e69d6942..09672a7c 100644 --- a/linux/testdisk.spec.in +++ b/linux/testdisk.spec.in @@ -29,6 +29,7 @@ BuildRequires: openssl-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: testdisk-doc +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %description Tool to check and undelete partition. Works with FAT12, FAT16, FAT32, @@ -75,14 +76,12 @@ make %configure \ --with-reiserfs-lib=${RPM_BUILD_DIR}/%{name}-%{version}/progsreiserfs-%ver_progsreiserfs/libreiserfs/.libs/ \ --with-reiserfs-includes=${RPM_BUILD_DIR}/%{name}-%{version}/progsreiserfs-%ver_progsreiserfs/include/ \ - --with-dal-lib=${RPM_BUILD_DIR}/%{name}-%{version}/progsreiserfs-%ver_progsreiserfs/libdal/.libs/ + --with-dal-lib=${RPM_BUILD_DIR}/%{name}-%{version}/progsreiserfs-%ver_progsreiserfs/libdal/.libs/ \ + --docdir=%{_pkgdocdir} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" install -%if 0%{?is_wip} -mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}-WIP $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -93,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/fidentify.8* %{_mandir}/man8/photorec.8* %{_mandir}/man8/testdisk.8* +%{_mandir}/zh_CN/man8/fidentify.8* +%{_mandir}/zh_CN/man8/photorec.8* +%{_mandir}/zh_CN/man8/testdisk.8* %attr(755,root,root) %{_bindir}/fidentify %attr(755,root,root) %{_bindir}/photorec %attr(755,root,root) %{_bindir}/testdisk diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 00000000..6b118bca --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = zh_CN + +man_MANS = testdisk.8 photorec.8 fidentify.8 +EXTRA_DIST = testdisk.8.in photorec.8.in fidentify.8.in diff --git a/doc_src/fidentify.8.in b/man/fidentify.8.in similarity index 100% rename from doc_src/fidentify.8.in rename to man/fidentify.8.in diff --git a/doc_src/photorec.8.in b/man/photorec.8.in similarity index 100% rename from doc_src/photorec.8.in rename to man/photorec.8.in diff --git a/doc_src/testdisk.8.in b/man/testdisk.8.in similarity index 100% rename from doc_src/testdisk.8.in rename to man/testdisk.8.in diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am new file mode 100644 index 00000000..b29f8a78 --- /dev/null +++ b/man/zh_CN/Makefile.am @@ -0,0 +1,4 @@ +mandir = @mandir@/zh_CN + +man_MANS = testdisk.8 photorec.8 fidentify.8 +EXTRA_DIST = testdisk.8.in photorec.8.in fidentify.8.in diff --git a/man/zh_CN/fidentify.8.in b/man/zh_CN/fidentify.8.in new file mode 100644 index 00000000..f8ba9355 --- /dev/null +++ b/man/zh_CN/fidentify.8.in @@ -0,0 +1,20 @@ +.\" May be distributed under the GNU General Public License +.TH FIDENTIFY 8 @TESTDISKDATE@ "Administration Tools" +.SH NAME +fidentify \- 从硬盘，数码相机或光盘中恢复丢失的文件 +.SH SYNOPSIS +.BI "fidentify [目录] +.sp +.SH DESCRIPTION + \fBfidentify\fP 识别文件类型，以及“扩展名”，其中使用与 PhotoRec 相同的数据库。 +.SH SEE ALSO +.BR photorec(8), +.BR +.SH TRANSLATION +Zhou Mo +.SH AUTHOR +PhotoRec @VERSION@, 数据恢复工具, @TESTDISKDATE@ +.br +Christophe GRENIER +.br +http://www.cgsecurity.org diff --git a/man/zh_CN/photorec.8.in b/man/zh_CN/photorec.8.in new file mode 100644 index 00000000..6270bd46 --- /dev/null +++ b/man/zh_CN/photorec.8.in @@ -0,0 +1,29 @@ +.\" May be distributed under the GNU General Public License +.TH PHOTOREC 8 @TESTDISKDATE@ "Administration Tools" +.SH NAME +photorec \- 从硬盘，数码相机或光盘中恢复丢失的文件 +.SH SYNOPSIS +.BI "photorec [/log] [/debug] [/d recup_dir] [device|image.dd|image.e01] +.sp +.BI "photorec /version +.SH DESCRIPTION + \fBPhotoRec\fP 是一个数据恢复工具，它能从硬盘、光盘中恢复丢失的文件包括视频，文档，归档，以及从数码相机存储中恢复丢失的图片(Photo Recovery)。PhotoRec 会忽略文件系统，并根据基本的数据进行恢复。所以即便您存储介质上的文件系统遭到了严重破坏，或者被格式化，它仍能工作。 PhotoRec 的使用是安全的，因为它会拒绝对目标 驱动器/存储器 进行写入操作。 +.SH OPTIONS +.TP +.B /log +新建 photorec.log 日志文件 +.TP +.B /debug +添加 debug 信息 +.SH SEE ALSO +.BR testdisk(8), +.BR fdisk (8). +.BR +.SH TRANSLATION +Zhou Mo +.SH AUTHOR +PhotoRec @VERSION@, 数据恢复工具, @TESTDISKDATE@ +.br +Christophe GRENIER +.br +http://www.cgsecurity.org diff --git a/man/zh_CN/testdisk.8.in b/man/zh_CN/testdisk.8.in new file mode 100644 index 00000000..a9e8a9d2 --- /dev/null +++ b/man/zh_CN/testdisk.8.in @@ -0,0 +1,65 @@ +.\" May be distributed under the GNU General Public License +.TH TESTDISK 8 @TESTDISKDATE@ "Administration Tools" +.SH NAME +testdisk \- 扫描和恢复硬盘分区 +.SH SYNOPSIS +.BI "testdisk [/log] [/debug] [/dump] [device|image.dd|image.e01] +.sp +.BI "testdisk /version +.sp +.BI "testdisk /list [/log] +.SH DESCRIPTION + \fBTestDisk\fP 检查和恢复丢失的分区 + 适用的文件系统 : + - BeFS (BeOS) + - BSD disklabel (FreeBSD/OpenBSD/NetBSD) + - CramFS, 压缩文件系统 + - DOS/Windows FAT12, FAT16 and FAT32 + - HFS and HFS+, Hierarchical File System + - JFS, IBM 的日志文件系统 + - Linux ext2/ext3/ext4 + - Linux Raid + RAID 1: 镜像 + RAID 4: striped array with parity device + RAID 5: striped array with distributed parity information + RAID 6: striped array with distributed dual redundancy information + - Linux Swap (versions 1 and 2) + - LVM and LVM2, Linux Logical Volume Manager + - Mac partition map + - Novell Storage Services NSS + - NTFS (Windows NT/2K/XP/2003/Vista/...) + - ReiserFS 3.5, 3.6 and 4 + - Sun Solaris i386 disklabel + - Unix 文件系统 UFS and UFS2 (Sun/BSD/...) + - XFS, SGI's 日志文件系统 + + 反删除功能适用于 : + - DOS/Windows FAT12, FAT16 and FAT32 + - Linux ext2 + - NTFS (Windows NT/2K/XP/2003/Vista/...) + +.SH OPTIONS +.TP +.B /log +新建一个 testdisk.log 日志文件 +.TP +.B /debug +添加 debug 信息 +.TP +.B /dump +转储 raw 扇区 +.TP +.B /list +显示当前的分区 +.SH SEE ALSO +.BR fdisk (8), +.BR photorec(8). +.BR +.SH TRANSLATION +Zhou Mo +.SH AUTHOR +TestDisk @VERSION@, 数据恢复工具, @TESTDISKDATE@ +.br +Christophe GRENIER +.br +http://www.cgsecurity.org