Move perl modules to perl5lib. Allow easier installation under /usr/share/perl5.

* Reorganize perl modules by putting them under a perl5lib subdir. Improve
  installation so they are installed in the same place as before unless
  otherwise stated, but install under /usr/share/perl5 for Debian. Modify
  Makefile.in to properly deal with the above.
* Fix LinuxDocTools.pm permissions.
* Fix doc/Makedoc.sh to use the above location.
* No need to play with LinuxDocTools.pm in debian/rules. We already try Debian
  sgml-data site first when looking for sgml entities.
parent 2d5838ca
......@@ -8,12 +8,14 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
datadir = @datadir@
mandir = @mandir@
PERL = @PERL@
pkgdatadir = $(datadir)/linuxdoc-tools
LINUXDOCDOC = $(prefix)/share/doc/linuxdoc-tools
mandir = @mandir@
mandir1 = $(mandir)/man1
texdir = $(pkgdatadir)
PERL = @PERL@
perl5libdir = $(pkgdatadir)
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
......@@ -130,6 +132,11 @@ endif
find $(LINUXDOCDOC) -type d -print | xargs chmod 755
find $(LINUXDOCDOC) -type f -print | xargs chmod 644
# -- Install perl modules
mkdir -p $(perl5libdir)/LinuxDocTools
$(INSTALL_DATA) perl5lib/LinuxDocTools.pm $(perl5libdir)
$(INSTALL_DATA) perl5lib/LinuxDocTools/*.pm $(perl5libdir)/LinuxDocTools
# -- Install tex stuff
mkdir -p $(texdir)
$(INSTALL_DATA) tex/* $(texdir)
......
......@@ -49,11 +49,6 @@ build-stamp:
-e "s:/usr/bin/[gm]awk:/usr/share/linuxdoc-tools/awkwhich:" \
bin/linuxdoc > linuxdoc.new;
# --- Rewrite to use iso-entities from debian sgml-data package
sed -e "s:prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat:prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog:" \
lib/LinuxDocTools.pm > LinuxDocTools.pm.new;
$(build_ldt_copyright)
for i in text latex info; do \
......@@ -101,8 +96,6 @@ install: build
install -m 755 debian/addition/awkwhich \
debian/tmp/usr/share/linuxdoc-tools/awkwhich;
install -m 755 linuxdoc.new debian/tmp/usr/bin/linuxdoc
install -m 0644 LinuxDocTools.pm.new \
debian/tmp/usr/share/linuxdoc-tools/LinuxDocTools.pm
# ---
cat debian/linuxdoc-tools.info-base doc/guide.info > doc/linuxdoc-sgml.info
dh_installinfo doc/linuxdoc-sgml.info
......
......@@ -18,6 +18,7 @@ trap 'abort' 1 2 3 6 9 15
# export DATADIR=${DATADIR}
export PKGDATADIR=${DATADIR}/linuxdoc-tools
export PERL5LIB=${DATADIR}/linuxdoc-tools:${TMPDIR}
export PERL5LIB=../perl5lib:${TMPDIR}
mkdir $TMPDIR/Text
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment