test-load targets: Use strip to sanitise whitespace in OTHER_DIRS so that the subst...

[chiark-tcl.git] / base / extension.make

diff --git a/base/extension.make b/base/extension.make
index 502d45bdbd9634cd961c2a831f19ea96f4e3afd0..4da0272b0aac6365ffb0502829d337d4cebc0553 100644 (file)
--- a/base/extension.make
+++ b/base/extension.make
@@ -12,9 +12,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 
 
@@ -43,4 +41,18 @@ TCMDIFARGS ?=        -p$(FAMILY)_$(EXTBASE) -o$@ $(BASE_TCT) $(OTHER_TCTS) $<
 %+tcmdif.h:    %.tct $(BASE_TCT) $(OTHER_TCTS) $(TCMDIFGEN)
                $(TCMDIFGEN) -wh $(TCMDIFARGS)
 
+OTHER_DIRS +=  ../base/
+OTHER_DIRS +=  $(addprefix ../,$(dir $(OTHER_EXTS)))
+OTHER_DIRS +=  .
+
+null :=
+space := $(null) #
+
+$(SHLIB).test.tcl:
+               echo >$@ "load $(SHLIB).so"
+
+test-load:     $(SHLIB).so $(SHLIB).test.tcl
+               LD_LIBRARY_PATH=$(subst $(space),:,$(strip $(OTHER_DIRS)))$${LD_LIBRARY_PATH+:}$${LD_LIBRARY_PATH} \
+               tclsh$(TCL_VERSION) $(SHLIB).test.tcl
+
 include                $(BASE_DIR)/final.make