diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2009-12-29 16:30:02 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2009-12-29 16:30:02 -0500 |
| commit | e7f255f9cb73bb51957bcdc87981d20a0a3f58b0 (patch) | |
| tree | 9360d2be03f070a0f1ceee0c5b7263411d045010 | |
| parent | 4908f76bb1c8467796dcb2084417bc8ebbef6350 (diff) | |
Rename the executable to bin/run-soffice.
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rwxr-xr-x | run-test.sh.in | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 80039b9..95cdba1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,11 +1,13 @@ -EXEC=test BINDIR=@BINDIR@ SRCDIR=@ROOTDIR@/source INCDIR=@ROOTDIR@/inc OBJDIR=@OBJDIR@ +EXECDIR=@EXECDIR@ UREDIR=@OOO_INSTALL_PATH@/ure +EXEC=$(EXECDIR)/run-soffice + LDFLAGS= \ -luno_sal -luno_cppuhelpergcc3 -luno_cppu -luno_salhelpergcc3 \ -L@OOO_INSTALL_PATH@/program \ @@ -28,6 +30,7 @@ all: $(EXEC) pre: mkdir $(OBJDIR) 2>/dev/null || /bin/true + mkdir $(EXECDIR) 2>/dev/null || /bin/true $(EXEC): pre $(OBJFILES) $(CXX) -o $@ $(OBJFILES) -lc $(LDFLAGS) diff --git a/configure.ac b/configure.ac index 3e9f6d5..d20951d 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,9 @@ AC_SUBST(ROOTDIR) OBJDIR=$ROOTDIR/obj AC_SUBST(OBJDIR) +EXECDIR=$ROOTDIR/bin +AC_SUBST(EXECDIR) + OOO_INSTALL_PATH=$with_ooo AC_MSG_CHECKING([OOo installation]) if test -f "$OOO_INSTALL_PATH/program/soffice.bin"; then diff --git a/run-test.sh.in b/run-test.sh.in index 14edb5b..5aadd29 100755 --- a/run-test.sh.in +++ b/run-test.sh.in @@ -2,7 +2,7 @@ export LD_LIBRARY_PATH=@OOO_INSTALL_PATH@/program:@OOO_INSTALL_PATH@/ure/lib source @ROOTDIR@/setenv.sh -mkdir "$CTRL_XLS_OUT_DIR" || /bin/true +mkdir "$CTRL_XLS_OUT_DIR" 2>/dev/null || /bin/true cd @OOO_INSTALL_PATH@/ure/lib -@ROOTDIR@/test +@EXECDIR@/run-soffice |