diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-01 15:30:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 18:03:36 +0200 |
| commit | f1d0889058c112c5a594755be7f3482ced2da395 (patch) | |
| tree | 0b995cccb8e57add808376fe237948d0ed217354 /solenv | |
| parent | be59288ff46a7f3462f5d055f06edacc59340c36 (diff) | |
put result of make test-install into top-level test-install dir
... and rename all DEVINSTALL variables to TESTINSTALL.
Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/callcatcher.Makefile | 2 | ||||
| -rwxr-xr-x | solenv/bin/install-gdb-printers | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile index 7c24f9af93fb..269484792f55 100644 --- a/solenv/bin/callcatcher.Makefile +++ b/solenv/bin/callcatcher.Makefile @@ -24,7 +24,7 @@ include $(SOLARENV)/gbuild/gbuild.mk findunusedcode: $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild - ooinstall -l $(DEVINSTALLDIR)/opt + ooinstall -l $(TESTINSTALLDIR)/opt $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \ $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \ diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index 4c2aa393c78c..599c1b157f31 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -9,7 +9,7 @@ GDBDIR="${SOLARENV}/gdb" SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib" -INSTALLDIR="${DEVINSTALLDIR}/opt" +INSTALLDIR="${TESTINSTALLDIR}/opt" DYLIB=so if [ "$(uname)" = Darwin ]; then INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 23a2431567b5..23e2d09df723 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -262,7 +262,7 @@ gb_GLOBALDEFS += \ gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) -gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(DEVINSTALLDIR)/) +gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(TESTINSTALLDIR)/) include $(GBUILDDIR)/Deliver.mk |