diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-02-20 08:05:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-02-20 08:05:56 +0000 |
| commit | 7cb6d2a58c1554cb86608d77fa1aba557c73e852 (patch) | |
| tree | 32f615a9215daddebe422a94b55751d4ba3d9be1 /solenv | |
| parent | ece39cbd8505afaf4eda4fcce28c7e9274a8360f (diff) | |
INTEGRATION: CWS vcl17 (1.47.34); FILE MERGED
2003/12/09 13:59:07 pl 1.47.34.1: #i18647# make patches work with subprojects
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/tg_ext.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index c9fbf47295c2..1e6958bbdf07 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_ext.mk,v $ # -# $Revision: 1.48 $ +# $Revision: 1.49 $ # -# last change: $Author: vg $ $Date: 2003-12-16 11:38:45 $ +# last change: $Author: obo $ $Date: 2004-02-20 09:05:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -313,9 +313,9 @@ create_patch : $(MISC)$/$(TARFILE_ROOTDIR) $(P_ADDITIONAL_FILES) @+-$(RM) $(NEW_PATCH_FILE_NAME).bak >& $(NULLDEV) #ignore returncode of 1 (indicates differences...) # hard coded again to get the same directory level as before. quite ugly... - +-cd $(ROUT) && diff -rc misc$/$(TARFILE_ROOTDIR) misc$/build$/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)$/bin$/cleandiff.pl | tr -d "\015" > misc$/$(NEW_PATCH_FILE_NAME).tmp + +-cd $(PRJ)$/$(ROUT) && diff -rc misc$/$(TARFILE_ROOTDIR) misc$/build$/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)$/bin$/cleandiff.pl | tr -d "\015" > misc$/$(NEW_PATCH_FILE_NAME).tmp @+-mv $(NEW_PATCH_FILE_NAME) $(NEW_PATCH_FILE_NAME).bak >& $(NULLDEV) - @+-mv $(MISC)$/$(NEW_PATCH_FILE_NAME).tmp $(NEW_PATCH_FILE_NAME) >& $(NULLDEV) + @+-mv $(MISC)$/$(NEW_PATCH_FILE_NAME).tmp $(PRJ)$/$(NEW_PATCH_FILE_NAME) >& $(NULLDEV) @+echo still some problems with win32 generated patches... create_clean : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) |