From 0119a791083f1ab9ad76bacb668f1faa445147d1 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 28 Sep 2005 11:06:25 +0000
Subject: INTEGRATION: CWS ause037 (1.14.58); FILE MERGED 2005/09/06 15:29:28
 hjs 1.14.58.1: #125412# allow building to shared output tree

---
 helpcontent2/util/smath/makefile.mk   | 10 +++++-----
 helpcontent2/util/swriter/makefile.mk | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'helpcontent2/util')

diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index 76bde03346..0acd3b7e8e 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: vg $ $Date: 2005-03-09 14:08:49 $
+#*    last change       $Author: hr $ $Date: 2005-09-28 12:05:57 $
 #*
-#*    $Revision: 1.14 $
+#*    $Revision: 1.15 $
 #*
 #*    $Logfile:$
 #*
@@ -32,7 +32,7 @@ zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
 ZIP1TARGET=xhp_smath
 ZIP1FLAGS= -u -r
-ZIP1DIR=$(MISC)$/$(LANGDIR)
+ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/smath$/* -x "*.dphh*" -x "*.hzip" -x "*.created"
 .ENDIF			# "$(SOLAR_JAVA)"!=""
 
@@ -40,13 +40,13 @@ ZIP1LIST=$(LANGDIR)$/text$/smath$/* -x "*.dphh*" -x "*.hzip" -x "*.created"
 LINKNAME=smath
 LINKADDEDFILES= \
    -add smath.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \
-   -add smath.tree $(MISC)$/LANGUAGE$/smath.tree \
+   -add smath.tree $(COMMONMISC)$/LANGUAGE$/smath.tree \
    -add smath.jar  $(BIN)$/xhp_smath_LANGUAGE.zip
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \
-   $(MISC)$/LANGUAGE$/smath.tree \
+   $(COMMONMISC)$/LANGUAGE$/smath.tree \
    $(BIN)$/xhp_smath_LANGUAGE.zip
 
 
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 2afb3d30a4..60a96fc0d9 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: vg $ $Date: 2005-03-09 14:08:49 $
+#*    last change       $Author: hr $ $Date: 2005-09-28 12:06:25 $
 #*
-#*    $Revision: 1.14 $
+#*    $Revision: 1.15 $
 #*
 #*    $Logfile:$
 #*
@@ -32,7 +32,7 @@ zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
 ZIP1TARGET=xhp_swriter
 ZIP1FLAGS= -u -r
-ZIP1DIR=$(MISC)$/$(LANGDIR)
+ZIP1DIR=$(COMMONMISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/swriter$/* -x "*.dphh*" -x "*.hzip" -x "*.created"
 .ENDIF			# "$(SOLAR_JAVA)"!=""
 
@@ -40,13 +40,13 @@ ZIP1LIST=$(LANGDIR)$/text$/swriter$/* -x "*.dphh*" -x "*.hzip" -x "*.created"
 LINKNAME=swriter
 LINKADDEDFILES= \
    -add swriter.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \
-   -add swriter.tree $(MISC)$/LANGUAGE$/swriter.tree \
+   -add swriter.tree $(COMMONMISC)$/LANGUAGE$/swriter.tree \
    -add swriter.jar  $(BIN)$/xhp_swriter_LANGUAGE.zip
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \
-   $(MISC)$/LANGUAGE$/swriter.tree \
+   $(COMMONMISC)$/LANGUAGE$/swriter.tree \
    $(BIN)$/xhp_swriter_LANGUAGE.zip
 
 
-- 
cgit