Kill UPDMINOR and UPDMINOREXT stuff

As far as I know we have no intention to use that stuff. Do we ever
have any idea what it means? But sure, if it turns out that we do want
to, this commit will have to be reverted.

6 files changed, 41 insertions, 46 deletions

diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index 1ffa7fd39123..dd86f7e4a825 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -53,7 +53,7 @@ CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA
 
 # --- TARGETS -----------------------------------------------------
 
-$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg $(SOLARENV)/inc/ant.properties
+$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg $(SOLARENV)/inc/ant.properties
     @echo "Making:   " $@
     @echo solar.build=$(BUILD) > $@
     @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 4c9fbae5072c..bc4baa85bb12 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -61,7 +61,7 @@ installationtest_instset = \
 .IF "$(OS)" == "WNT"
 installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag`
 .ELSE
-installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation$(UPDMINOREXT)
+installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation
 .END
 
 .IF "$(OS)" == "MACOSX"
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index e14c94de5719..0cad0a3a7f35 100755..100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -157,7 +157,7 @@ L_X64=$(SOLARLIBDIR_X64)
 VERSIONOBJ_X64=$(SLO_X64)/_version.obj
 BIN_X64=$(BIN)/x64
 RES_X64=$(RES)/x64
-SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)/x64
+SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib/x64
 LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64)
 
 .IF "$(LIBTARGET)"==""
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index a694295baf1c..ebfd2a93fa32 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -64,16 +64,16 @@ EXTNAME*=$(EXTENSIONNAME)_in
 WRONG_SOURCEVERSION
 .ENDIF
 
-# Create $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk if needed
+# Create $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk if needed
 %minor.mk : $(SOLARENV)/inc/minor.mk
-    @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
-    @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk
-    @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
+    @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc
+    @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
+    @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
 .ENDIF          # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
 
-# Force creation of $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/
+# Force creation of $(SOLARVERSION)/$(INPATH)/inc/
 # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk
-.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk
+.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
 
 .IF "$(BSCLIENT)"=="TRUE"
 .IF "$(UPDATER)"!="YES"
@@ -767,39 +767,34 @@ BIN=$(PRJ)/$(OUTPATH).xl/bin
 # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
 
 .IF "$(common_build)"!=""
-SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(UPDMINOREXT)
+SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl
 .ELSE
-SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT)
+SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl
 .ENDIF
 
-#.IF "$(UPDMINOR)" != ""
-#UPDMINOREXT=.$(UPDMINOR)
-#.ELSE
-#UPDMINOREXT=
-#.ENDIF
-SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)
-SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)
-SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(UPDMINOREXT)
-SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
+SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res
+SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib
+SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java
+SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc
 .IF "$(SOLARLANG)"!="deut"
 .IF "$(SOLARLANG)" != ""
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(SOLARLANG)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)/$(SOLARLANG)
-.ENDIF
-.ENDIF
-SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(UPDMINOREXT)
-SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(UPDMINOREXT)
-SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(UPDMINOREXT)
-SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(UPDMINOREXT)
-SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(UPDMINOREXT)
-SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(UPDMINOREXT)
-SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(UPDMINOREXT)
-SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(UPDMINOREXT)
-SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(UPDMINOREXT)
-SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(UPDMINOREXT)
-SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(UPDMINOREXT)
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc/$(SOLARLANG)
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res/$(SOLARLANG)
+.ENDIF
+.ENDIF
+SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin
+SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr
+SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par
+SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml
+SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc
+SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck
+SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf
+SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin
+SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res
+SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck
+SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf
 .IF "$(common_build)"==""
 SOLARCOMMONBINDIR=$(SOLARBINDIR)
 SOLARCOMMONRESDIR=$(SOLARRESDIR)
@@ -912,9 +907,9 @@ CDEFSOPT=-DOPTIMIZE
 
 MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/)
 MKDEPALLINC=$(SOLARINC:s/-I/ -I/)
-MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc$(UPDMINOREXT)
+MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc
 MKDEPSOLENV=-I$(SOLARENV)/inc -I$(SOLARENV)/$(GUI)$(COMEX)/inc
-MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) -I$(SOLARVERSION)/$(INPATH)/inc
+MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc
 MKDEPLOCAL=-I$(INCCOM)
 
 .IF "$(MKDEPENDALL)"!=""
diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
index 02bd45fb18ce..bd028d835921 100644
--- a/solenv/inc/startup/startup.mk
+++ b/solenv/inc/startup/startup.mk
@@ -30,7 +30,7 @@ CALLMACROS:=$(MAKEMACROS)
 CALLTARGETS=$(MAKETARGETS)
 .ENDIF			# "$(TNR)" == ""
 
-.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
+.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc $(SOLARENV)$/inc
 
 # Grab key definitions from the environment
 # .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 8b5902fede73..3824bdfdebf1 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1032,7 +1032,7 @@ ALL_JAVA_TARGETS= \
 .IF "$(lintit)"==""
 .IF "$(L10N_framework)"!=""
 ALLTAR:	\
-        "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \
+        "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \
         $(SUBDIRS)		\
         $(DPRTARGET) \
         $(DPZTARGET) \
@@ -1080,7 +1080,7 @@ ALLTAR:	\
 .ELSE			# "$(L10N_framework)"!=""
 
 ALLTAR: \
-        "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \
+        "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \
         $(MAKEDEMODIR)	$(MAKECOMPDIR) $(MAKEXLDIR)	\
         $(COMPVERMK) \
         $(JAVAVERMK) \
@@ -1419,7 +1419,7 @@ $(SCP_PRODUCT_TYPE):
 
 .ENDIF			# "$(PARFILES)"!=""
 
-"$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg" :
+"$(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg" :
     $(TOUCH) $@
 
 .IF "$(COMPVERMK)"!=""
@@ -1428,7 +1428,7 @@ $(SCP_PRODUCT_TYPE):
 COMPVERMK_PHONY:=.PHONY
 .ENDIF			# "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
 COMPVTMP:=$(mktmp iii)
-"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
+"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
 .IF "$(CCNUMVER)"!=""
     @echo COMNAME:=$(COMNAME) > $(COMPVTMP)
     @echo COMID:=$(COMID) >> $(COMPVTMP)
@@ -1456,7 +1456,7 @@ COMPVTMP:=$(mktmp iii)
 .IF "$(JAVALOCATION)"!="$(JAVA_HOME)"
 "$(JAVAVERMK)" .PHONY :
 .ELSE          # "$(JAVALOCATION)"!="$(JAVA_HOME)"
-"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
+"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
 .ENDIF          # "$(JAVALOCATION)"!="$(JAVA_HOME)"
     @-$(RM) $@
     @echo JAVAVER:=$(JAVAVER) > $@
@@ -1960,7 +1960,7 @@ $(MISC)/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGE
 .ENDIF
 
 VERSIONTMP:=$(mktmp iii)
-$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg
+$(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)