summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2010-01-22 18:57:57 +0100
committerKurt Zenker <kz@openoffice.org>2010-01-22 18:57:57 +0100
commit3db6881b28e9fb08cdfe1f4cac8c8251b123b05e (patch)
tree115393eac3fd2b437fa1c9e1698a87904339ee5b
parent0e6633d40e720360f357518d033307b1ab40e93a (diff)
parentcd97cfbaf1bbd74a42bc4bda1b192d7709fc64ee (diff)
bserver50: merge to m64
-rw-r--r--solenv/bin/modules/SourceConfig.pm2
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/unitools.mk2
3 files changed, 5 insertions, 5 deletions
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index b1005b26d6c7..23d89d882bb8 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -322,7 +322,7 @@ SourceConfig::get_config_file_default_path()
=head1 AUTHOR
-Vladimir Glazunov, vg@openoffice.com
+Vladimir Glazunov, vg@openoffice.org
=head1 SEE ALSO
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a2bc21bf3116..eb479d4adafb 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m63(Build:9435)
-BUILD=9435
-LAST_MINOR=m63
+RSCREVISION=300m64(Build:9446)
+BUILD=9446
+LAST_MINOR=m64
SOURCEVERSION=DEV300
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 6166161348e6..e76d1e292a62 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -103,7 +103,7 @@ COPYUPDATE=-u
ECHON=echo -n
ECHONL=echo
FIND*=find
-FLIPCMD*=slfl.pl
+FLIPCMD*=$(PERL) $(SOLARENV)/bin/slfl.pl
GNUCOPY*=cp
GNUMAKE*=make
GREP*=grep