summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-01-25 10:06:02 +0000
committerOliver Bolte <obo@openoffice.org>2007-01-25 10:06:02 +0000
commitd6aa6faed7ac3a7dad3aaec3bf3e3bdf9e7e0a2b (patch)
treecba5dd71773556916b65caba70ef6984b4339750
parentINTEGRATION: CWS jsc17 (1.8.8); FILE MERGED (diff)
downloadcore-d6aa6faed7ac3a7dad3aaec3bf3e3bdf9e7e0a2b.tar.gz
core-d6aa6faed7ac3a7dad3aaec3bf3e3bdf9e7e0a2b.zip
INTEGRATION: CWS jsc17 (1.5.134); FILE MERGED
2007/01/22 15:35:28 jsc 1.5.134.1: #i73750# change UNOPKG_EXT to UNOOXT_EXT
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile
index 1dae16e0f2fe..9432746e9ab7 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile
@@ -2,9 +2,9 @@
#
# $RCSfile: Makefile,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: rt $ $Date: 2005-01-31 16:43:32 $
+# last change: $Author: obo $ $Date: 2007-01-25 11:06:02 $
#
# The Contents of this file are made available subject to the terms of
# the BSD license.
@@ -54,8 +54,8 @@ SAMPLE_GEN_OUT = $(OUT_MISC)/$(SAMPLE_NAME)
COMP_NAME=SampleFilter
COMP_CLASS_OUT=$(SAMPLE_CLASS_OUT)/$(COMP_NAME)
-COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOPKG_EXT)
-COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOPKG_EXT)")
+COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT)
+COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)")
COMP_JAR_NAME = $(COMP_NAME).uno.jar
COMP_JAR = $(SAMPLE_CLASS_OUT)/$(COMP_JAR_NAME)
COMP_MANIFESTFILE = $(SAMPLE_GEN_OUT)/$(COMP_NAME).uno.Manifest
@@ -114,7 +114,7 @@ $(COMP_PACKAGE) : $(COMP_JAR) TypeDetection.xcu $(COMP_UNOPKG_MANIFEST)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(SDK_ZIP) $@ TypeDetection.xcu
cd $(subst /,$(PS),$(SAMPLE_CLASS_OUT)) && $(SDK_ZIP) -u ../../bin/$(@F) $(<F)
- cd $(subst /,$(PS),$(SAMPLE_GEN_OUT)/$(subst .$(UNOPKG_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
+ cd $(subst /,$(PS),$(SAMPLE_GEN_OUT)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
$(COMP_REGISTERFLAG) : $(COMP_PACKAGE)
ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"