diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 11:47:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:54 +0200 |
| commit | a58b65d380a6637e0d740b3a01162dcbfc38b61d (patch) | |
| tree | d69a361fd709c88071d57182566e1a4eb0008d1b | |
| parent | 9fe5f4602581add2bbcc66b4a98d5a6949de1b57 (diff) | |
Undo basis/brand split: moved spadmin.bin from basis to brand.
| -rw-r--r-- | padmin/source/spadmin.sh | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh index 7ae0cfcffeba..c41d505ce149 100644 --- a/padmin/source/spadmin.sh +++ b/padmin/source/spadmin.sh @@ -94,5 +94,5 @@ PATH=$sd_prog${PATH+:$PATH} export PATH # execute binary -exec "$sd_prog/../basis-link/program/spadmin.bin" "$@" \ +exec "$sd_prog/spadmin.bin" "$@" \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 77c3545f0831..72843922ee70 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -205,7 +205,7 @@ End File gid_File_Bin_Spadmin_Bin BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "spadmin.bin"; End |