Commit 7701cf8f authored by Agustin Martin Domingo's avatar Agustin Martin Domingo

Use a specific prefix variable ($isoentities_prefix) for iso-entities location.

Signed-off-by: default avatarAgustin Martin Domingo <agmartin@debian.org>
parent d2e1ff76
......@@ -2,7 +2,7 @@
# Makefile.in
#
# Copyright (C) 1996 Sven Rudolph
# Copyright (C) 2008-2013 Agustin Martin
# Copyright (C) 2008-2015 Agustin Martin
prefix = @prefix@
exec_prefix = @exec_prefix@
......@@ -194,6 +194,7 @@ endif
bin/linuxdoc:: Makefile bin/linuxdoc.in
sed -e 's!\@prefix\@!$(prefix)!g' \
-e 's!\@isoentities_prefix\@!$(prefix)!g' \
-e 's!\@auxbindir\@!$(auxbindir)!g' \
-e 's!\@pkgdatadir\@!$(pkgdatadir)!g' \
-e 's!\@perl5libdir\@!$(perl5libdir)!g' \
......
......@@ -14,11 +14,16 @@ sub BEGIN {
use strict;
use vars qw($prefix $DataDir $AuxBinDir $progs);
use vars qw($prefix
$isoentities_prefix
$DataDir
$AuxBinDir
$progs);
$prefix = "@prefix@";
$DataDir = "@pkgdatadir@";
$AuxBinDir = "@auxbindir@";
$prefix = "@prefix@";
$isoentities_prefix = "@isoentities_prefix@";
$DataDir = "@pkgdatadir@";
$AuxBinDir = "@auxbindir@";
use lib "@pkgdatadir@";
use lib "@perl5libdir@";
......
......@@ -56,13 +56,14 @@ export PATH=${PATH}:${TMP_BINDIR}
# Create a linuxdoc copy using our temporary locations.
sed < ../bin/linuxdoc.in > $TMPDIR/linuxdoc \
-e 's!\@prefix\@!'${TMPDIR}/usr'!g' \
-e 's!\@auxbindir\@!'${TMP_BINDIR}'!g' \
-e 's!\@pkgdatadir\@!'${TMPDATADIR}'!g' \
-e 's!\@perl5libdir\@!'${TMPDIR}'!g' \
-e 's!\@GROFFMACRO\@!-ms!g' \
-e 's!\@PERL\@!'${PERL}'!g' \
-e 's!\@PERLWARN\@!!g'
-e 's!\@prefix\@!'${TMPDIR}/usr'!g' \
-e 's!\@isoentities_prefix\@!'${TMPDIR}/usr'!g' \
-e 's!\@auxbindir\@!'${TMP_BINDIR}'!g' \
-e 's!\@pkgdatadir\@!'${TMPDATADIR}'!g' \
-e 's!\@perl5libdir\@!'${TMPDIR}'!g' \
-e 's!\@GROFFMACRO\@!-ms!g' \
-e 's!\@PERL\@!'${PERL}'!g' \
-e 's!\@PERLWARN\@!!g'
chmod u+x $TMPDIR/linuxdoc
......
......@@ -416,8 +416,8 @@ sub process_options {
# Setup the SGML environment.`iso-entites' sub directory will be removed for Debian package
# and entities from Debian sgml-data package used if present (first entry below).
my @sgmlcatalogs = ( "$main::prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog",
"$main::prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat",
my @sgmlcatalogs = ( "$main::isoentities_prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog",
"$main::isoentities_prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat",
"$main::DataDir/linuxdoc-tools.catalog",
"/etc/sgml.catalog");
......
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