X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=base%2Fextension.make;h=5cfc951a1c02226227ab6cfe54bb7882a801a1a6;hp=a881a9eec8be8cbc701d4eae3b90f0d1f4a1922e;hb=refs%2Fheads%2Fmaster;hpb=a97929d1f73dc47cc83440fe95c8a222cd8fbd5f;ds=sidebyside

diff --git a/base/extension.make b/base/extension.make
index a881a9e..8023992 100644
--- a/base/extension.make
+++ b/base/extension.make
@@ -41,18 +41,22 @@ 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 +=	$(BASE_DIR)
 OTHER_DIRS +=	$(addprefix ../,$(dir $(OTHER_EXTS)))
 OTHER_DIRS +=	.
 
 null :=
 space := $(null) #
 
-$(SHLIB).test.tcl:
+test-load.tcl:
 		echo >$@ "load $(SHLIB).so"
 
-test-load:	$(SHLIB).so $(SHLIB).test.tcl
-		LD_LIBRARY_PATH=$(subst $(space),:,$(OTHER_DIRS))$${LD_LIBRARY_PATH+:}$${LD_LIBRARY_PATH} \
-		tclsh$(TCL_VERSION) $(SHLIB).test.tcl
+test-load:	$(SHLIB).so test-load.tcl
+		@set -x; LD_LIBRARY_PATH=$(subst $(space),:,$(strip $(OTHER_DIRS)))$${LD_LIBRARY_PATH+:}$${LD_LIBRARY_PATH} \
+		tclsh$(TCL_VERSION) test-load.tcl
+
+debian-substvars: all
+		set -e; d=`pwd`; cd ..; \
+		dpkg-shlibdeps -T"$$d"/$@ "$$d"/$(SHLIB).so
 
 include		$(BASE_DIR)/final.make