summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2002-10-25 16:05:13 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2002-10-25 16:05:13 +0000
commit4c8a5a4c01ebfc2bcbec85a3fbd0aa7ba4adb94d (patch)
tree3f5b81d82d7bf43909e46368959b2f995321e872
parentcc54ec1d9380e40ddf8d12abf109c67c1787f35e (diff)
#100157# win32/tcsh
-rw-r--r--extensions/source/activex/main/makefile.mk16
1 files changed, 10 insertions, 6 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index 094958bbb34d..bca74d8769b0 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -1,12 +1,12 @@
#**************************************************************************
#
-# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/activex/main/makefile.mk,v 1.1 2002-08-14 14:40:52 mav Exp $
+# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/activex/main/makefile.mk,v 1.2 2002-10-25 17:05:13 hjs Exp $
#
# =========================================================================
#
-# $Date: 2002-08-14 14:40:52 $
-# $Author: mav $
-# $Revision: 1.1 $
+# $Date: 2002-10-25 17:05:13 $
+# $Author: hjs $
+# $Revision: 1.2 $
#
# =========================================================================
#
@@ -82,8 +82,12 @@ SHL1RES=$(RES)$/$(TARGET).res
.INCLUDE : target.mk
-$(MISC)$/envsettings.h :
+$(MISC)$/envsettings.h : makefile.mk
+-$(RM) $@
# it looks wrong; but rc likes it that way...
- +echo #define MISC .$/..$/$(INPATH)$/misc > $@
+.IF "$(USE_SHELL)"!="4nt"
+ +echo "#define MISC .\..\$(INPATH)\misc" > $@
+.ELSE # "$(USE_SHELL)"!="4nt"
+ +echo #define MISC .\..\$(INPATH)\misc > $@
+.ENDIF # "$(USE_SHELL)"!="4nt"