diff --git a/Makefile.in b/Makefile.in index 5576de8..dc39016 100644 --- a/Makefile.in +++ b/Makefile.in @@ -113,6 +113,7 @@ TCLSH_CMD = @TCLSH_CMD@ # Where do we want to install the tcl plugin # TCLLIBDIR = @TCLLIBDIR@ +TCLDATADIR = @TCLDATADIR@ # The suffix used on shared libraries. Ex: ".dll", ".so", ".dylib" # @@ -791,9 +825,10 @@ pkgIndex.tcl: echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@ tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR) + $(INSTALL) -d $(DESTDIR)$(TCLDATADIR) $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR) rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a - $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR) + $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLDATADIR) clean: rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la diff --git a/configure.ac b/configure.ac index 5facc75..6bc23a7 100644 --- a/configure.ac +++ b/configure.ac @@ -158,7 +158,15 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then done TCLLIBDIR="${TCLLIBDIR}/sqlite3" fi - +AC_ARG_VAR([TCLDATADIR], [Where to install tcl plugin]) +if test "x${TCLDATADIR+set}" != "xset" ; then + TCLDATADIR='$(datadir)' + for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do + TCLDATADIR=$i + break + done + TCLDATADIR="${TCLDATADIR}/sqlite3" +fi ######### # Set up an appropriate program prefix