diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-07 11:21:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-07 11:21:13 +0000 |
| commit | 4f108a0bdc7784bdf6996076cec0146e9554f4c3 (patch) | |
| tree | fc6c8c67a3a4a9257827bfd32f76959ff8452e05 /solenv | |
| parent | 3542a3fecd5c1ef3ff937636659b3b395b9fdce4 (diff) | |
#i87923# fixes for macosx
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 8 | ||||
| -rw-r--r-- | solenv/inc/tg_ext.mk | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 840d2d42a940..80fb166092d1 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -2,9 +2,9 @@ # # $RCSfile: macosx-change-install-names.pl,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: vg $ $Date: 2008-03-18 12:56:41 $ +# last change: $Author: kz $ $Date: 2008-04-07 12:21:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,8 +52,8 @@ sub action($$$) return $act; } -@ARGV == 3 || @ARGV >= 3 && $ARGV[0] eq "extshl" or - die "Usage: app|shl|extshl UREBIN|URELIB|OOO|BRAND|OXT <filepath>+"; +@ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or + die "Usage: app|shl|extshl UREBIN|URELIB|OOO|BRAND|OXT <filepath>*"; $type = shift @ARGV; $loc = shift @ARGV; if ($type eq "extshl") diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index fcd1cf3081ac..06a4735a44c6 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_ext.mk,v $ # -# $Revision: 1.85 $ +# $Revision: 1.86 $ # -# last change: $Author: vg $ $Date: 2008-03-18 13:09:10 $ +# last change: $Author: kz $ $Date: 2008-04-07 12:21:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -266,7 +266,9 @@ $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) $(COPY) $(foreach,i,$(OUT2LIB) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(LB) .IF "$(OS)"=="MACOSX" $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl \ - $(EXTRPATH) $(shell ls $(foreach,j,$(OUT2LIB) $(LB)$/$(j:f))) + $(EXTRPATH) \ + $(shell ls $(foreach,j,$(OUT2LIB) $(LB)$/$(j:f)) | \ + (grep -v '\.a$$' || test $$? = 1)) .ENDIF .ENDIF # "$(OUT2LIB)"!="" .IF "$(OUT2INC)"!="" |