The following commit has been merged in the master branch:
commit 7cf26ac0535b155e97f27ecb05fce61c3cc4eab0
Author: Agustin Martin Domingo <agmartin at debian.org>
Date: Mon Jul 7 19:48:21 2008 +0200
Relocating fmt and mapping files to simpler locations. Simpler symlink handling.
* lib/dist/fmt* moved to lib/fmt
* lib/dist/linuxdoc-tools/* moved to lib/mappings
* lib/mappings/{latin1,nippon}/mapping: use explicit symlinks instead
of setting them from Makefile.in.
* lib/LinuxDocTools.pm: Use new locations if nothing is found in previous
locations.
* lib/dtd:
- Add explicit linuxdoc.dtd and linuxdoctr.dtd symlinks
* Makefile.in:
- No longer set latin1 and nippon mappings symlinks
- No longer set dtd/linuxdoc{,tr}.dtd symlinks here
- No longer need to set all those linuxdoc* obsolete symlinks
diff --git a/Makefile.in b/Makefile.in
index d474458..149e472 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,10 +1,8 @@
#
# Makefile.in
#
-# $Id: Makefile.in,v 1.7 2002/01/28 17:43:59 sano Exp $
-#
-# Copyright 1996 Sven Rudolph
-#
+# Copyright (C) 1996 Sven Rudolph
+# Copyright (C) 2008 Agustin Martin
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -114,18 +112,12 @@ endif
ifeq ($(BUILD_SGMLSASP), true)
$(INSTALL_DATA) man/sgmlsasp.1 $(mandir1)/sgmlsasp.1
endif
+# Fix permissions in $(pkgdatadir)
find $(pkgdatadir) -type d -print | xargs chmod 755
find $(pkgdatadir) -type f -print | xargs chmod 644
- (cd $(pkgdatadir)/dist/linuxdoc-tools/latin1; rm -f mapping; ln -s ../groff/mapping .)
- (cd $(pkgdatadir)/dist/linuxdoc-tools/nippon; rm -f mapping; ln -s ../groff/tr-mapping ./mapping)
- (cd $(pkgdatadir)/dist; rm -f linuxdoc; ln -s linuxdoc-tools linuxdoc)
- (cd $(pkgdatadir)/dist; rm -f linuxdoctr; ln -s linuxdoc-tools linuxdoctr)
- (cd $(pkgdatadir)/dist; rm -f linuxdoc96; ln -s linuxdoc-tools linuxdoc96)
- (cd $(pkgdatadir)/dist; rm -f linuxdoctr96; ln -s linuxdoc-tools linuxdoctr96)
- (cd $(pkgdatadir)/dist; rm -f linuxdoc97; ln -s linuxdoc-tools linuxdoc97)
- (cd $(pkgdatadir)/dtd; rm -f linuxdoc.dtd; ln -s linuxdoc96.dtd linuxdoc.dtd)
- (cd $(pkgdatadir)/dtd; rm -f linuxdoctr.dtd; ln -s linuxdoctr96.dtd linuxdoctr.dtd)
+
(cd $(bindir); for i in $(progs); do rm -f $$i; ln -s linuxdoc $$i;done)
+
@echo "Installing documentation in $(LINUXDOCDOC) ..."
(cd doc; PATH=${PATH}:$(bindir) PREFIX=$(prefix) BINDIR=$(bindir) \
DATADIR=$(datadir) bash Makedoc.sh)
diff --git a/lib/LinuxDocTools.pm b/lib/LinuxDocTools.pm
index 0de8c5e..824b8aa 100755
--- a/lib/LinuxDocTools.pm
+++ b/lib/LinuxDocTools.pm
@@ -327,7 +327,8 @@ sub init {
# including options for all formats.
my %locations = ();
foreach my $path ("$main::DataDir/site",
- "$main::DataDir/dist"){
+ "$main::DataDir/dist",
+ "$main::DataDir/fmt"){
foreach my $location (<$path/fmt_*.pl>){
my $fmt = $location;
$fmt =~ s/^.*_//;
@@ -594,12 +595,14 @@ sub process_file {
my $style = ($global->{style}) ?
ldt_searchfile(["$main::DataDir/site/$dtd/$global->{format}/$global->{style}mapping",
- "$main::DataDir/dist/$dtd/$global->{format}/$global->{style}mapping"])
+ "$main::DataDir/dist/$dtd/$global->{format}/$global->{style}mapping",
+ "$main::DataDir/mappings/$global->{format}/$global->{style}mapping"])
:
'';
my $mapping = ldt_searchfile(["$main::DataDir/site/$dtd/$global->{format}/mapping",
- "$main::DataDir/dist/$dtd/$global->{format}/mapping"])
+ "$main::DataDir/dist/$dtd/$global->{format}/mapping",
+ "$main::DataDir/mappings/$global->{format}/mapping"])
or die "$error_header: Could not find mapping file for $dtd/$global->{format}. Aborting ...\n";
$mapping = "$style $mapping" if $style;
@@ -617,7 +620,7 @@ sub process_file {
if ($global->{format} eq "groff" or $global->{format} eq "latex2e"){
if ($dtd eq "linuxdoctr") {
- $mapping = "$main::DataDir/dist/$dtd/$global->{format}/tr-mapping";
+ $mapping = "$main::DataDir/mappings/$global->{format}/tr-mapping";
}
}
diff --git a/lib/dtd/linuxdoc.dtd b/lib/dtd/linuxdoc.dtd
new file mode 120000
index 0000000..7437fe5
--- /dev/null
+++ b/lib/dtd/linuxdoc.dtd
@@ -0,0 +1 @@
+linuxdoc96.dtd
\ No newline at end of file
diff --git a/lib/dtd/linuxdoctr.dtd b/lib/dtd/linuxdoctr.dtd
new file mode 120000
index 0000000..3e9e321
--- /dev/null
+++ b/lib/dtd/linuxdoctr.dtd
@@ -0,0 +1 @@
+linuxdoctr96.dtd
\ No newline at end of file
diff --git a/lib/dist/fmt_html.pl b/lib/fmt/fmt_html.pl
similarity index 100%
rename from lib/dist/fmt_html.pl
rename to lib/fmt/fmt_html.pl
diff --git a/lib/dist/fmt_info.pl b/lib/fmt/fmt_info.pl
similarity index 100%
rename from lib/dist/fmt_info.pl
rename to lib/fmt/fmt_info.pl
diff --git a/lib/dist/fmt_latex2e.pl b/lib/fmt/fmt_latex2e.pl
similarity index 100%
rename from lib/dist/fmt_latex2e.pl
rename to lib/fmt/fmt_latex2e.pl
diff --git a/lib/dist/fmt_lyx.pl b/lib/fmt/fmt_lyx.pl
similarity index 100%
rename from lib/dist/fmt_lyx.pl
rename to lib/fmt/fmt_lyx.pl
diff --git a/lib/dist/fmt_rtf.pl b/lib/fmt/fmt_rtf.pl
similarity index 100%
rename from lib/dist/fmt_rtf.pl
rename to lib/fmt/fmt_rtf.pl
diff --git a/lib/dist/fmt_txt.pl b/lib/fmt/fmt_txt.pl
similarity index 100%
rename from lib/dist/fmt_txt.pl
rename to lib/fmt/fmt_txt.pl
diff --git a/lib/dist/linuxdoc-tools/groff/mapping b/lib/mappings/groff/mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/groff/mapping
rename to lib/mappings/groff/mapping
diff --git a/lib/dist/linuxdoc-tools/groff/math.README b/lib/mappings/groff/math.README
similarity index 100%
rename from lib/dist/linuxdoc-tools/groff/math.README
rename to lib/mappings/groff/math.README
diff --git a/lib/dist/linuxdoc-tools/groff/tr-mapping b/lib/mappings/groff/tr-mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/groff/tr-mapping
rename to lib/mappings/groff/tr-mapping
diff --git a/lib/dist/linuxdoc-tools/html/mapping b/lib/mappings/html/mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/html/mapping
rename to lib/mappings/html/mapping
diff --git a/lib/dist/linuxdoc-tools/info/mapping b/lib/mappings/info/mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/info/mapping
rename to lib/mappings/info/mapping
diff --git a/lib/dist/linuxdoc-tools/latex2e/mapping b/lib/mappings/latex2e/mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/latex2e/mapping
rename to lib/mappings/latex2e/mapping
diff --git a/lib/dist/linuxdoc-tools/latex2e/tr-mapping b/lib/mappings/latex2e/tr-mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/latex2e/tr-mapping
rename to lib/mappings/latex2e/tr-mapping
diff --git a/lib/dist/linuxdoc-tools/latin1/README b/lib/mappings/latin1/README
similarity index 100%
rename from lib/dist/linuxdoc-tools/latin1/README
rename to lib/mappings/latin1/README
diff --git a/lib/mappings/latin1/mapping b/lib/mappings/latin1/mapping
new file mode 120000
index 0000000..702e5e0
--- /dev/null
+++ b/lib/mappings/latin1/mapping
@@ -0,0 +1 @@
+../groff/mapping
\ No newline at end of file
diff --git a/lib/dist/linuxdoc-tools/lyx/mapping b/lib/mappings/lyx/mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/lyx/mapping
rename to lib/mappings/lyx/mapping
diff --git a/lib/dist/linuxdoc-tools/man/mapping b/lib/mappings/man/mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/man/mapping
rename to lib/mappings/man/mapping
diff --git a/lib/dist/linuxdoc-tools/nippon/README b/lib/mappings/nippon/README
similarity index 100%
rename from lib/dist/linuxdoc-tools/nippon/README
rename to lib/mappings/nippon/README
diff --git a/lib/mappings/nippon/mapping b/lib/mappings/nippon/mapping
new file mode 120000
index 0000000..07d9f4a
--- /dev/null
+++ b/lib/mappings/nippon/mapping
@@ -0,0 +1 @@
+../groff/tr-mapping
\ No newline at end of file
diff --git a/lib/dist/linuxdoc-tools/rtf/mapping b/lib/mappings/rtf/mapping
similarity index 100%
rename from lib/dist/linuxdoc-tools/rtf/mapping
rename to lib/mappings/rtf/mapping
--
linuxdoc-tools package for Debian.