a little instdir sub-dir cleanup

Change-Id: I97df3f949da7403e46951cf159a9fc1fca4cc23f

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)"

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

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