Set version number in AC_INIT() in configure.ac only

Output a solenv/inc/minor.mk based on that. Get rid of RSCVERSION and
RSCREVISION. Automate the end of the copyright year range, although I
am actually not sure if that is OK.

Change-Id: Ibae2d139b1dd468ee80d18a2a41b786a532df809

10 files changed, 35 insertions, 45 deletions

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 2a0890edd2de..7ab8fef0a2a7 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -58,7 +58,7 @@ define gb_Jar__command
 	mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF && \
 	echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \
 	$(if $(JARCLASSPATH),echo "Class-Path: $(strip $(JARCLASSPATH))" >> $(call gb_Jar_get_manifest_target,$(1)) &&) \
-	echo "Solar-Version: $(RSCREVISION)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
+	echo "Solar-Version: $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
 	$(if $(MANIFEST),cat $(MANIFEST) >> $(call gb_Jar_get_manifest_target,$(1)) &&) \
 	mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \
 	$(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 3762090e6c5b..0e58250aa145 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -24,7 +24,7 @@ $(MISC)/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS1NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -46,7 +46,7 @@ $(SRS)/$(SRS1NAME).srs: $(SRC1FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -65,7 +65,7 @@ $(MISC)/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS2NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -87,7 +87,7 @@ $(SRS)/$(SRS2NAME).srs: $(SRC2FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -106,7 +106,7 @@ $(MISC)/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS3NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -128,7 +128,7 @@ $(SRS)/$(SRS3NAME).srs: $(SRC3FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -147,7 +147,7 @@ $(MISC)/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS4NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -169,7 +169,7 @@ $(SRS)/$(SRS4NAME).srs: $(SRC4FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -188,7 +188,7 @@ $(MISC)/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS5NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -210,7 +210,7 @@ $(SRS)/$(SRS5NAME).srs: $(SRC5FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -229,7 +229,7 @@ $(MISC)/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS6NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -251,7 +251,7 @@ $(SRS)/$(SRS6NAME).srs: $(SRC6FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -270,7 +270,7 @@ $(MISC)/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS7NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -292,7 +292,7 @@ $(SRS)/$(SRS7NAME).srs: $(SRC7FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -311,7 +311,7 @@ $(MISC)/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS8NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -333,7 +333,7 @@ $(SRS)/$(SRS8NAME).srs: $(SRC8FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -352,7 +352,7 @@ $(MISC)/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS9NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -374,7 +374,7 @@ $(SRS)/$(SRS9NAME).srs: $(SRC9FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
@@ -393,7 +393,7 @@ $(MISC)/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS10NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)-fp={$(SRS)/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -415,7 +415,7 @@ $(SRS)/$(SRS10NAME).srs: $(SRC10FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
         -fp=$@.$(INPATH) \
         $< \
     )
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index dd86f7e4a825..fffeb777a72d 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -56,8 +56,6 @@ CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA
 $(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg $(SOLARENV)/inc/ant.properties
     @echo "Making:   " $@
     @echo solar.build=$(BUILD) > $@
-    @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@
-    @echo solar.rscrevision=$(USQ)$(RSCREVISION)$(USQ) >> $@
     @echo solar.minor=$(LAST_MINOR) >> $@
     @echo solar.sourceversion=$(SOURCEVERSION) >> $@
     @echo solar.udkstamp=$(UDKSTAMP) >> $@
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
deleted file mode 100644
index 7f9f543e303c..000000000000
--- a/solenv/inc/minor.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-RSCVERSION=410
-RSCREVISION=410m1(Build:0)
-BUILD=0
-LAST_MINOR=m0
-SOURCEVERSION=OOO410
-
-VERSIONMAJOR=4
-VERSIONMINOR=1
-VERSIONMICRO=0
-
-COPYRIGHTYEARRANGE=2000-2013
diff --git a/solenv/inc/minor.mk.in b/solenv/inc/minor.mk.in
new file mode 100644
index 000000000000..2e96c0bea044
--- /dev/null
+++ b/solenv/inc/minor.mk.in
@@ -0,0 +1,9 @@
+BUILD=@LIBO_VERSION_PATCH@
+LAST_MINOR=m0
+SOURCEVERSION=OOO410
+
+VERSIONMAJOR=@LIBO_VERSION_MAJOR@
+VERSIONMINOR=@LIBO_VERSION_MINOR@
+VERSIONMICRO=@LIBO_VERSION_MICRO@
+
+COPYRIGHTYEARRANGE=2000-@LIBO_THIS_YEAR@
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index b2e8f35c931b..30e77a5de961 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -884,10 +884,6 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
 COMPILE_ECHO_SWITCH=
 COMPILE_ECHO_FILE=$(<:f)
 
-#new
-RSCUPDVER=$(RSCREVISION)
-RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
-
 RSCFLAGS=-s
 RSCDEFS=-D$(GUI) -D$(COM) $(JAVADEF)
 
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 43e7f6a1740c..ff82ed2effee 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1829,7 +1829,6 @@ $(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
     @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP)
     @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)"                 >> $(VERSIONTMP)
     @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)"   >> $(VERSIONTMP)
-    @echo $(EMQ)#define _RSCREVISION $(EMQ)"$(USQ)$(RSCREVISION)$(USQ)$(EMQ)" >> $(VERSIONTMP)
     @echo $(EMQ)#define _INPATH $(EMQ)"$(INPATH)$(EMQ)"           >> $(VERSIONTMP)
     @@-$(RM) $(@)_$(VERSIONTMP:b)
     @$(TYPE) $(VERSIONTMP) > $(@)_$(VERSIONTMP:b)
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index df39ba65229f..22a63a920d04 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -56,8 +56,7 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
 .IF "$(JARCLASSPATH)" != ""
     $(COMMAND_ECHO)echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@
 .ENDIF
-# $(RSCREVISION) contains chars that must be quoted (for *NIX shells)
-    $(COMMAND_ECHO)echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@
+    $(COMMAND_ECHO)echo $(USQ)Solar-Version: $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(USQ) >> $@
 .IF "$(CUSTOMMANIFESTFILE)"!=""
     $(COMMAND_ECHO)$(TYPE) $(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
 .ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index 2102ecd6633e..df6a26c0ccc8 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -34,10 +34,10 @@ $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY:
     @-$(MKDIRHIER) $(MISC)/java/com/sun/star/upd
 .IF "$(OS)"!="WNT"
     @echo package com.sun.star.upd\; > $@
-    @echo 'public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";}' >> $@
+    @echo 'public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)";}' >> $@
 .ELSE			# "$(OS)"!="WNT"
     @echo package com.sun.star.upd; > $@
-    @echo public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";} >> $@
+    @echo public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)";} >> $@
 .ENDIF			# "$(OS)"!="WNT"
 
 .IF "$(JAVATARGET)"!=""
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 4d98307c72cc..a3c2c5b86994 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -26,7 +26,7 @@ $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
 $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
+    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
 
 .IF "$(WITH_LANG)"!=""
 
@@ -48,7 +48,7 @@ $(SRS)/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+        $(INCLUDE) $(RSCDEFS) -DUPDVER=$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \
         -fp=$@.$(INPATH) \
         $< \
     )