From ac4ecac209831a3c1a3b04a242c884ef6e32c2da Mon Sep 17 00:00:00 2001 From: Tommy Reynolds Date: Fri, 3 Mar 2006 23:20:32 +0000 Subject: Place the per-document entities file in the ${LANG}/ directory, where it belonged all along. Using relative paths from within the local entities should work the same as relative paths elsewhere. With using the symbolic link "../doc-entities.ent" previously, relative paths within the per-document entities had to be relative to the parent directory unlike all other relative paths in the document. --- Makefile.common | 5 +---- common/entities/Makefile | 2 +- common/entities/entities-de.ent | 16 ++++++++-------- common/entities/entities-en.ent | 16 ++++++++-------- common/entities/entities-en_US.ent | 16 ++++++++-------- common/entities/entities-it.ent | 16 ++++++++-------- common/entities/entities-pt_BR.ent | 16 ++++++++-------- common/entities/entities-ru.ent | 16 ++++++++-------- common/entities/entities-zh_CN.ent | 16 ++++++++-------- common/entities/entities.pot | 2 +- 10 files changed, 59 insertions(+), 62 deletions(-) diff --git a/Makefile.common b/Makefile.common index fb9bdd2..557b51f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -781,14 +781,11 @@ define LOCALE_template set-locale-${1}:: ${LN} -f -s ${FDPDIR}/docs-common/common/entities/entities-${1}.ent \ ${FDP_ENTITIES} -ifneq "${DOC_ENTITIES}" "" - ${LN} -f -s ${1}/${DOC_ENTITIES}.ent . -endif clean:: ${RM} ${FDP_ENTITIES} ifneq "${DOC_ENTITIES}" "" - ${RM} ${DOC_ENTITIES}.ent + ${RM} ${1}/${DOC_ENTITIES}.ent endif help:: diff --git a/common/entities/Makefile b/common/entities/Makefile index bd53c0d..528ddcd 100644 --- a/common/entities/Makefile +++ b/common/entities/Makefile @@ -32,7 +32,7 @@ HELPFMT ="%-23s\t| %s.\n" ####################################################################### # FDPCOMMONDIR:=$(shell cd .. && /bin/pwd) -FDPCOMMONDIR:=../docs-common/common +FDPCOMMONDIR:=../../docs-common/common ####################################################################### ####################################################################### diff --git a/common/entities/entities-de.ent b/common/entities/entities-de.ent index 692370c..c8c8090 100644 --- a/common/entities/entities-de.ent +++ b/common/entities/entities-de.ent @@ -1,5 +1,5 @@ - + @@ -41,13 +41,13 @@ - - - - - - - + + + + + + + diff --git a/common/entities/entities-en.ent b/common/entities/entities-en.ent index 692370c..c8c8090 100644 --- a/common/entities/entities-en.ent +++ b/common/entities/entities-en.ent @@ -1,5 +1,5 @@ - + @@ -41,13 +41,13 @@ - - - - - - - + + + + + + + diff --git a/common/entities/entities-en_US.ent b/common/entities/entities-en_US.ent index 692370c..c8c8090 100644 --- a/common/entities/entities-en_US.ent +++ b/common/entities/entities-en_US.ent @@ -1,5 +1,5 @@ - + @@ -41,13 +41,13 @@ - - - - - - - + + + + + + + diff --git a/common/entities/entities-it.ent b/common/entities/entities-it.ent index 66e0c78..aba1c4b 100644 --- a/common/entities/entities-it.ent +++ b/common/entities/entities-it.ent @@ -1,5 +1,5 @@ - + @@ -41,13 +41,13 @@ - - - - - - - + + + + + + + diff --git a/common/entities/entities-pt_BR.ent b/common/entities/entities-pt_BR.ent index d89953c..ede79da 100644 --- a/common/entities/entities-pt_BR.ent +++ b/common/entities/entities-pt_BR.ent @@ -1,5 +1,5 @@ - + @@ -41,13 +41,13 @@ - - - - - - - + + + + + + + diff --git a/common/entities/entities-ru.ent b/common/entities/entities-ru.ent index 692370c..c8c8090 100644 --- a/common/entities/entities-ru.ent +++ b/common/entities/entities-ru.ent @@ -1,5 +1,5 @@ - + @@ -41,13 +41,13 @@ - - - - - - - + + + + + + + diff --git a/common/entities/entities-zh_CN.ent b/common/entities/entities-zh_CN.ent index 692370c..c8c8090 100644 --- a/common/entities/entities-zh_CN.ent +++ b/common/entities/entities-zh_CN.ent @@ -1,5 +1,5 @@ - + @@ -41,13 +41,13 @@ - - - - - - - + + + + + + + diff --git a/common/entities/entities.pot b/common/entities/entities.pot index b21b333..036566e 100644 --- a/common/entities/entities.pot +++ b/common/entities/entities.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-03-03 10:22-0600\n" +"POT-Creation-Date: 2006-03-03 15:18-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit