summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-08-07 11:45:52 +0200
committerMichael Stahl <mstahl@redhat.com>2014-08-07 11:49:15 +0200
commitff929ad45cdd803db0da49423648256f8380b3a1 (patch)
treebea20303717bcce8ecf1c7812fc710437293c3ec
parentf1589f768bbd1d8baea6e442f392831851bdbb3b (diff)
remove unnecessary references to test-install (just use instdir)
Change-Id: I99f19a3e2ed166c2ea4397f8767975973dd5d983
-rw-r--r--README.cross3
-rw-r--r--configure.ac4
-rwxr-xr-xoox/source/drawingml/customshapes/README6
3 files changed, 5 insertions, 8 deletions
diff --git a/README.cross b/README.cross
index 5ad963f3957f..451751d34621 100644
--- a/README.cross
+++ b/README.cross
@@ -220,9 +220,6 @@ TODO:
others; would be best to avoid that if at all possible (using a free
cab implementation, part of Wine or something)
- MSI generation
- - if at all possible, the make test-install installation (with links
- back to the build) should be done so that it would be directly
- executable via wine after doing make test-install :-)
- runtime
- no idea if the entire thing works after the installation at all; I
diff --git a/configure.ac b/configure.ac
index 17c8d3fded6b..8706f17ddabc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9868,7 +9868,7 @@ if test "$_os" = "WINNT" -a "$cross_compiling" != "yes"; then
if test "$WITH_MINGW" = "yes"; then
AC_PATH_PROG([UUIDGEN], [uuid])
if test -z "$UUIDGEN"; then
- AC_MSG_WARN([uuid is needed for test-install])
+ AC_MSG_WARN([uuid is needed for building installation sets])
fi
else
# presence is already tested above in the WINDOWS_SDK_HOME check
@@ -9878,7 +9878,7 @@ if test "$_os" = "WINNT" -a "$cross_compiling" != "yes"; then
else
AC_PATH_PROG([UUIDGEN], [uuidgen])
if test -z "$UUIDGEN"; then
- AC_MSG_WARN([uuid is needed for test-install])
+ AC_MSG_WARN([uuid is needed for building installation sets])
fi
fi
diff --git a/oox/source/drawingml/customshapes/README b/oox/source/drawingml/customshapes/README
index e537c24bf7c3..0d4fab9bf6ff 100755
--- a/oox/source/drawingml/customshapes/README
+++ b/oox/source/drawingml/customshapes/README
@@ -10,9 +10,9 @@
set -o errexit
-# To re-generate the code, you need to be on Linux (I think). You
-# might need to have done a make test-install. oox needs to be build
-# with dbglevel=2 so that DEBUG is defined.
+# To re-generate the code, you need to be on Linux (I think).
+# It is not necessary to do a make test-install, just run from instdir.
+# oox needs to be build with dbglevel=2 so that DEBUG is defined.
make oox.clean && make oox dbglevel=2