strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#65293# prevent circular deps on first build

Browse source
This commit is contained in:
Hans-Joachim Lankenau 2001-11-07 17:43:20 +00:00
parent 231b95fd3f
commit 6c48e17983
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
solenv/inc/settings.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: settings.mk,v $
#
# $Revision: 1.84 $
# $Revision: 1.85 $
#
# last change: $Author: hjs $ $Date: 2001-11-07 14:31:24 $
# last change: $Author: hjs $ $Date: 2001-11-07 18:43:20 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -103,6 +103,7 @@ SOLARVERSION=$(SOLARVER)$/$(UPD)
@+tr -d "\015" < $(SOLARVERSION)$/$(UPD)minor.mk > $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk
.ELSE # "$(GUI)"=="UNX"
@+$(COPY) $(SOLARVERSION)$/$(UPD)minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk >& $(NULLDEV)
@+$(COPY) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.flag >& $(NULLDEV)
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(UPDATER)"!=""

6
solenv/inc/target.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: target.mk,v $
#
# $Revision: 1.84 $
# $Revision: 1.85 $
#
# last change: $Author: hjs $ $Date: 2001-11-07 14:28:33 $
# last change: $Author: hjs $ $Date: 2001-11-07 18:43:20 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -2758,7 +2758,7 @@ $(MISC)$/$(TARGET).dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES)
$(MISC)$/$(TARGET).dpz : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN)
.ENDIF
$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk
$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.flag
.IF "$(GUI)"=="UNX"
@+echo "#define" _BUILD \"$(BUILD)\" > $@
@+echo "#define" _UPD \"$(UPD)\" >> $@