diff -uNr blt2.4z-orig/configure.in blt2.4z/configure.in --- blt2.4z-orig/configure.in 2002-10-04 09:33:23 +0400 +++ blt2.4z/configure.in 2004-10-30 17:53:40 +0400 @@ -1199,7 +1199,6 @@ SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC}" SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@' - LD_RUN_PATH="-Wl,-rpath,${loader_run_path}" LDFLAGS="" EXTRA_LIB_SPECS="-ldl" @@ -1396,7 +1395,7 @@ # assume /lib #-------------------------------------------------------------------- if test "x${blt_with_scriptdir}" = "x" ; then - BLT_LIBRARY="${prefix}/lib/blt${BLT_VERSION}" + BLT_LIBRARY="${prefix}/share/tcl/blt${BLT_VERSION}" else BLT_LIBRARY="${blt_with_scriptdir}/blt${BLT_VERSION}" fi diff -uNr blt2.4z-orig/demos/Makefile.in blt2.4z/demos/Makefile.in --- blt2.4z-orig/demos/Makefile.in 2002-02-19 03:11:46 +0300 +++ blt2.4z/demos/Makefile.in 2004-10-30 17:53:27 +0400 @@ -6,7 +6,7 @@ exec_prefix = @exec_prefix@ version = @BLT_VERSION@ libdir = @libdir@ -scriptdir = $(prefix)/lib/blt$(version) +scriptdir = $(prefix)/share/tcl/blt$(version) destdir = $(scriptdir)/demos srcdir = @srcdir@ @@ -78,8 +78,8 @@ if test -d $(INSTALL_ROOT)"$$i" ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)"$$i" ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)"$$i" ; \ fi ; \ done diff -uNr blt2.4z-orig/library/Makefile.in blt2.4z/library/Makefile.in --- blt2.4z-orig/library/Makefile.in 2002-07-15 03:33:24 +0400 +++ blt2.4z/library/Makefile.in 2004-10-30 17:54:29 +0400 @@ -47,7 +47,7 @@ rm -f pkgIndex.tcl sed -e 's/%VERSION%/$(version)/' $(srcdir)/pkgIndex.tcl.in | \ sed -e 's/%LIB_PREFIX%/$(lib_prefix)/' | \ - sed -e 's;%LIB_DIR%;$(libdir);' > pkgIndex.tcl + sed -e 's;%LIB_DIR%;$(libdir)/tcl;' > pkgIndex.tcl install: mkdirs pkgIndex @@ -58,15 +58,15 @@ for i in $(miscFiles) ; do \ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \ done - $(INSTALL_DATA) pkgIndex.tcl $(scriptdir) + $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir) mkdirs: @for i in $(instdirs) ; do \ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done diff -uNr blt2.4z-orig/library/pkgIndex.tcl.in blt2.4z/library/pkgIndex.tcl.in --- blt2.4z-orig/library/pkgIndex.tcl.in 2002-07-15 03:33:24 +0400 +++ blt2.4z/library/pkgIndex.tcl.in 2004-10-30 17:53:27 +0400 @@ -34,6 +34,6 @@ set version "%VERSION%" -package ifneeded BLT $version [list LoadBLT $version $dir] +package ifneeded BLT $version [list LoadBLT $version [file join $dir .. .. .. lib tcl]] # End of package index file diff -uNr blt2.4z-orig/Makefile.in blt2.4z/Makefile.in --- blt2.4z-orig/Makefile.in 2002-02-19 03:11:43 +0300 +++ blt2.4z/Makefile.in 2004-10-30 17:53:27 +0400 @@ -13,7 +13,7 @@ includedir = @includedir@ libdir = @libdir@ version = @BLT_VERSION@ -scriptdir = $(prefix)/lib/blt$(version) +scriptdir = $(prefix)/share/tcl/blt$(version) instdirs = $(prefix) \ $(exec_prefix) \ @@ -47,17 +47,14 @@ (cd library; $(MAKE) install) (cd man; $(MAKE) install) (cd demos; $(MAKE) install) - $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir) - $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir) - $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir) mkdirs: @for i in $(instdirs) ; do \ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done diff -uNr blt2.4z-orig/man/Makefile.in blt2.4z/man/Makefile.in --- blt2.4z-orig/man/Makefile.in 2002-02-19 03:11:46 +0300 +++ blt2.4z/man/Makefile.in 2004-10-30 17:53:27 +0400 @@ -51,8 +51,8 @@ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done diff -uNr blt2.4z-orig/src/Makefile.in blt2.4z/src/Makefile.in --- blt2.4z-orig/src/Makefile.in 2002-07-15 13:31:29 +0400 +++ blt2.4z/src/Makefile.in 2004-10-30 17:53:27 +0400 @@ -23,8 +23,8 @@ bindir = $(exec_prefix)/bin exec_prefix = @exec_prefix@ incdir = $(prefix)/include -libdir = @libdir@ -scriptdir = $(exec_prefix)/lib +libdir = @libdir@/tcl +scriptdir = $(exec_prefix)/share/tcl prefix = @prefix@ srcdir = @srcdir@ @@ -155,7 +155,7 @@ LN_S = @LN_S@ VPATH = $(srcdir) -all: $(bltsh) $(bltwish) @SHLIB_TARGET@ +all: @SHLIB_TARGET@ build_shared: (cd shared; $(MAKE) CFLAGS="$(CFLAGS)" all) @@ -186,7 +186,7 @@ $(AR) $@ $(TCL_ONLY_OBJS) bltInit.o $(RANLIB) $@ -install: mkdirs install-lib install-demo install-headers +install: mkdirs install-lib-shared install-headers install-demo: $(bltwish) $(bltsh) $(INSTALL) -m 0755 $(bltwish) $(INSTALL_ROOT)$(bindir) @@ -199,15 +199,18 @@ $(INSTALL_DATA) $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a) (cd $(INSTALL_ROOT)$(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a)) $(RANLIB) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a) - (cd shared; $(MAKE) install) + (cd shared; $(MAKE) install) + +install-lib-shared: + (cd shared; $(MAKE) install) mkdirs: @for i in $(instdirs) ; do \ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done diff -uNr blt2.4z-orig/src/shared/Makefile.in blt2.4z/src/shared/Makefile.in --- blt2.4z-orig/src/shared/Makefile.in 2002-05-15 01:37:19 +0400 +++ blt2.4z/src/shared/Makefile.in 2004-10-30 17:53:27 +0400 @@ -22,7 +22,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -libdir = @libdir@ +libdir = @libdir@/tcl bindir = $(exec_prefix)/bin srcdir = @srcdir@/.. @@ -123,7 +123,7 @@ lib_so = libBLT$(version)$(SHLIB_SUFFIX) tcl_only_lib_so = libBLTlite$(version)$(SHLIB_SUFFIX) -all: build_lib build_demo +all: build_lib build_demo: $(bltwish) $(bltsh) @@ -154,7 +154,7 @@ $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \ $(SHLIB_TCL_ONLY_LIB_SPECS) -install: mkdirs install-lib install-demo +install: mkdirs install-lib install-demo: $(bltwish) $(INSTALL) -m 0755 bltwish$(version) $(INSTALL_ROOT)$(bindir)