summaryrefslogtreecommitdiff
path: root/desktop/scripts
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-09-15 14:44:34 +0200
committerDavid Tardon <dtardon@redhat.com>2011-09-15 14:49:34 +0200
commit6df9c479f58ea94141a3a43eb7fd6fb4d1fd5c8b (patch)
tree5d653ab42c9bd2351538cdaa008c0e68058b5eb2 /desktop/scripts
parentab5ce3f70a5635c3ca141b5c8928a104b522e1bb (diff)
gbuildize desktop
Diffstat (limited to 'desktop/scripts')
-rwxr-xr-xdesktop/scripts/makefile.mk59
-rwxr-xr-xdesktop/scripts/soffice.sh.in2
2 files changed, 1 insertions, 60 deletions
diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk
deleted file mode 100755
index 55354f9d325c..000000000000
--- a/desktop/scripts/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=desktop
-TARGET=scripts
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Targets -------------------------------------------------------------
-
-UNIXTEXT= \
- $(MISC)$/sbase.sh \
- $(MISC)$/scalc.sh \
- $(MISC)$/sdraw.sh \
- $(MISC)$/simpress.sh \
- $(MISC)$/smaster.sh \
- $(MISC)$/smath.sh \
- $(MISC)$/sweb.sh \
- $(MISC)$/swriter.sh \
- $(MISC)$/mozwrapper.sh \
- $(MISC)$/unoinfo.sh \
- $(MISC)$/unopkg.sh \
- $(MISC)$/gdbtrace
-
-.IF "$(OS)" != "MACOSX"
-
-UNIXTEXT+= $(MISC)$/soffice.sh
-
-.ENDIF
-
-.INCLUDE : target.mk
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index 727095d1b2c6..28ee88964b09 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -174,4 +174,4 @@ if test "$#" -eq 1; then
fi
# oosplash does the rest: forcing pages in, javaldx etc. are
-exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash.bin" "$@"
+exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"