diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 10:27:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 10:27:01 +0000 |
| commit | b846c5000f6b97f112340cf4b2447f9ed122cb5a (patch) | |
| tree | 240893191a9d6cabe699f7c2adeecf60cb2fe5bf /odk/pack | |
| parent | c206ebd09669d2f88336e150c39c8a71d0bbd154 (diff) | |
INTEGRATION: CWS sdkfix (1.89.4); FILE MERGED
2008/07/18 12:34:31 jsc 1.89.4.1: #i91796# use template file + sed for dk.mk
Diffstat (limited to 'odk/pack')
| -rw-r--r-- | odk/pack/copying/makefile.mk | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 6963d6c5264f..ccec4721a66e 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.89 $ +# $Revision: 1.90 $ # # This file is part of OpenOffice.org. # @@ -236,20 +236,13 @@ $(DESTDIRBIN)$/addsym-macosx.sh : addsym-macosx.sh $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -chmod 755 $@ -$(DESTDIRSETTINGS)$/dk.mk : +$(DESTDIRSETTINGS)$/dk.mk : dk.mk @@-rm -f $@ - -$(MKDIRHIER) $(@:d) - @echo # $(TITLE) dependent settings > $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - @echo 'SDKVERSION=$(PRODUCT_RELEASE)'>> $@ - @echo 'BUILDID=$(RSCREVISION)'>> $@ -.ELSE - @echo SDKVERSION=$(PRODUCT_RELEASE)>> $@ - @echo BUILDID=$(RSCREVISION)>> $@ -.ENDIF + -$(MKDIRHIER) $(@:d) + tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@ $(CONVERTTAGFLAG) : $(DOCUHTMLFILES) - $(PERL) $(CONVERTTAGSCRIPT) 1 $(TITLE) $(OFFICEPRODUCTNAME) $(DOCUHTMLFILES) + $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES) @echo "tags converted" > $@ $(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(IDL_SINCE_TAGS) $(PRJ)$/docs$/common$/ref$/idl.css |