diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-07 22:52:43 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-07 22:53:46 +0100 |
| commit | bd5a6c285cbfbc77c3daad481687a1287a097a87 (patch) | |
| tree | 56363f6b45ddf1d88752efd72d20966c90d85046 | |
| parent | b38e996bcee13eacb61f340ccff787806c053ce8 (diff) | |
a little instdir sub-dir cleanup
Change-Id: I97df3f949da7403e46951cf159a9fc1fca4cc23f
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rwxr-xr-x | bin/verify-custom-widgets-libs | 2 | ||||
| -rw-r--r-- | solenv/bin/callcatcher.Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 4f2589556ae3..cb3efcb4f7a1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -275,11 +275,11 @@ dev-install: @echo @echo "dev-install is obsolete! Just build with \"make check\" and run" ifeq ($(OS),MACOSX) - @echo " open instdir/*/$(PRODUCTNAME).app" + @echo " open instdir/$(PRODUCTNAME).app" @echo - @echo "To debug: gdb instdir/*/$(PRODUCTNAME).app/Contents/MacOS/soffice" + @echo "To debug: gdb instdir/$(PRODUCTNAME).app/Contents/MacOS/soffice" else - @echo " instdir/*/program/soffice" + @echo " instdir/program/soffice" endif @echo @echo "(only if you have good reason to test an actual installation: make test-install)" diff --git a/bin/verify-custom-widgets-libs b/bin/verify-custom-widgets-libs index 3337013ae1bd..b0ea0a5e5a51 100755 --- a/bin/verify-custom-widgets-libs +++ b/bin/verify-custom-widgets-libs @@ -20,7 +20,7 @@ for foo in $FOO; do lib=$(echo $foo | cut -f1 -d-) symbol=$(echo $foo | cut -f2 -d-) echo testing if lib$lib.so contains make$symbol - nm -D instdir/unxlng*/program/lib$lib.so | grep make$symbol > /dev/null + nm -D instdir/program/lib$lib.so | grep make$symbol > /dev/null if [ $? != 0 ]; then echo "MISSING. Windows will crash" else diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile index 58bfe6fb3b83..10b09e3a9d2b 100644 --- a/solenv/bin/callcatcher.Makefile +++ b/solenv/bin/callcatcher.Makefile @@ -26,7 +26,7 @@ findunusedcode: $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck callanalyse \ - $(SRCDIR)/instdir/callcatcher/program/* \ + $(INSTDIR)/program/* \ $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \ $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \ > unusedcode.all |