summaryrefslogtreecommitdiff
path: root/cli_ure/version
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-07-25 06:55:26 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-07-25 06:55:26 +0000
commit4a3ee0657772c08e49a620ae2e25f212e893e5e6 (patch)
tree93e88fedd832cd5b55844bef1d52e3bf0779c0fd /cli_ure/version
parent67842e09816532a62d5efac249ae2f80bed01743 (diff)
INTEGRATION: CWS jl35 (1.2.12); FILE MERGED
2006/07/18 09:52:11 jl 1.2.12.2: #67482# no automatic version increment 2006/05/19 12:52:40 jl 1.2.12.1: #64551# project did not build when L10N_framework variable was set
Diffstat (limited to 'cli_ure/version')
-rw-r--r--cli_ure/version/makefile.mk24
1 files changed, 9 insertions, 15 deletions
diff --git a/cli_ure/version/makefile.mk b/cli_ure/version/makefile.mk
index 6299ef05140d..9ae3d75b8908 100644
--- a/cli_ure/version/makefile.mk
+++ b/cli_ure/version/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: rt $ $Date: 2006-03-09 10:54:55 $
+# last change: $Author: rt $ $Date: 2006-07-25 07:55:26 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -52,29 +52,23 @@ ECHOQUOTE='
ECHOQUOTE=
.ENDIF
-ALLTAR : \
- $(BIN)$/cliureversion.mk
-
.IF "$(BUILD_FOR_CLI)" != ""
ALLTAR : \
- $(BIN)$/cliureversion.mk \
- INCVERSION
+ $(BIN)$/cliureversion.mk
+
+# INCVERSION
$(BIN)$/cliureversion.mk: version.txt
$(GNUCOPY) $< $@
+#disabled because of #67482
#Create the config file that is used with the policy assembly
#only if new published types have been added, the cliureversion.mk is written.
-INCVERSION .PHONY: version.txt incversions.txt
- +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
- $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-.ELSE
-#deliver empty cliureversion.mk for other platforms
-$(BIN)$/cliureversion.mk .PHONY:
- @echo > $@
+#INCVERSION .PHONY: version.txt incversions.txt
+# +$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
+# $< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
.END