Sisyphus repositório
Última atualização: 1 outubro 2023 | SRPMs: 18631 | Visitas: 37514381
en ru br
ALT Linux repositórios
S:1.4.14-alt1
5.0: 1.3.0-alt5
4.1: 1.3.0-alt5
4.0: 1.3.0-alt5
3.0: 1.3.0-alt2

Group :: Desenvolvimento/Tcl
RPM: tcl-img

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs e FR  Repocop 

Patch: tcl-img-20040818-alt-tea.patch
Download

Index: Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.in	26 Sep 2004 10:37:14 -0000	1.1.1.1
+++ Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -109,37 +109,14 @@
 		cd $$here ; \
 	done
 
-collate: all
-	rm -f pkgIndex.tcl
-	touch pkgIndex.tcl
+install: all
 	for sub in $(SUBDIRS) ; \
 	do	\
 		here=`pwd` ; \
 		cd $$sub ; \
-		$(MAKE) install \
-			exec_prefix=$$here/Img/exec_prefix		\
-			prefix=$$here/Img/prefix			\
-			pkglibdir=$$here/Img/exec_prefix/lib/Img	\
-			;						\
+		$(MAKE) install; \
 		cd $$here ; \
-		cat Img/exec_prefix/lib/Img/pkgIndex.tcl >> pkgIndex.tcl ; \
 	done
-	mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl
-
-install: collate
-	mkdir -p    $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)
-	for p in Img/exec_prefix/lib/Img/* ; do \
-		$(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)/`basename $$p` ; \
-	done
-	mkdir -p $(INSTALL_ROOT)$(libdir)
-	for p in Img/exec_prefix/lib/*.sh ; do \
-		$(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(libdir)/`basename $$p` ; \
-	done
-	mkdir -p $(INSTALL_ROOT)$(includedir)
-	for p in Img/prefix/include/* ; do \
-		$(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(includedir)/`basename $$p` ; \
-	done
-
 
 bindist:
 
Index: pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pkgIndex.tcl.in	26 Sep 2004 10:37:14 -0000	1.1.1.1
+++ pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 
 if {[package vcompare [info tclversion] 8.0] < 0} return
 
-package ifneeded Img @IMG_PATCH_LEVEL@ "package require Tk; [list load [file join $dir @IMG_SHARED_LIB_FILE@] Img]"
+package ifneeded Img @IMG_PATCH_LEVEL@ "package require Tk; [list load [file join $dir .. .. .. lib tcl @IMG_SHARED_LIB_FILE@] Img]"
Index: base/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/base/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- base/Makefile.in	26 Sep 2004 10:37:14 -0000	1.1.1.1
+++ base/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -111,8 +111,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -228,7 +228,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -430,7 +430,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -449,8 +449,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 	$(INSTALL_DATA) tkimgConfig.sh $(DESTDIR)$(libdir)
Index: base/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/base/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- base/pkgIndex.tcl.in	26 Sep 2004 10:37:14 -0000	1.1.1.1
+++ base/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,7 +2,7 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.5 2003/03/09 17:13:07 obermeier Exp $
 
-package ifneeded @DPACKAGE@ @VERSION@ [list load [file join $dir @tkimg_LIB_FILE@]]
+package ifneeded @DPACKAGE@ @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimg_LIB_FILE@]]
 
 package ifneeded Img   @VERSION@ {
     # Compatibility hack. When asking for the old name of the package
Index: bmp/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/bmp/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- bmp/Makefile.in	26 Sep 2004 10:37:14 -0000	1.1.1.1
+++ bmp/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgbmpConfig.sh $(DESTDIR)$(libdir)
Index: bmp/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/bmp/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- bmp/pkgIndex.tcl.in	26 Sep 2004 10:37:14 -0000	1.1.1.1
+++ bmp/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/21 07:20:23 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgbmp_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgbmp_LIB_FILE@]]
Index: gif/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/gif/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gif/Makefile.in	26 Sep 2004 10:37:14 -0000	1.1.1.1
+++ gif/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimggifConfig.sh $(DESTDIR)$(libdir)
Index: gif/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/gif/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gif/pkgIndex.tcl.in	26 Sep 2004 10:37:14 -0000	1.1.1.1
+++ gif/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/21 07:20:23 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimggif_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimggif_LIB_FILE@]]
Index: ico/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/ico/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ico/Makefile.in	26 Sep 2004 10:37:15 -0000	1.1.1.1
+++ ico/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgicoConfig.sh $(DESTDIR)$(libdir)
Index: ico/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/ico/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ico/pkgIndex.tcl.in	26 Sep 2004 10:37:15 -0000	1.1.1.1
+++ ico/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:07 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgico_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgico_LIB_FILE@]]
Index: jpeg/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/jpeg/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- jpeg/Makefile.in	26 Sep 2004 10:37:15 -0000	1.1.1.1
+++ jpeg/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -114,8 +114,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -241,7 +241,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -448,7 +448,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -467,8 +467,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgjpegConfig.sh $(DESTDIR)$(libdir)
Index: jpeg/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/jpeg/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- jpeg/pkgIndex.tcl.in	26 Sep 2004 10:37:15 -0000	1.1.1.1
+++ jpeg/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/21 07:20:24 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgjpeg_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgjpeg_LIB_FILE@]]
Index: libjpeg/tcl/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/libjpeg/tcl/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libjpeg/tcl/Makefile.in	26 Sep 2004 15:37:17 -0000	1.2
+++ libjpeg/tcl/Makefile.in	26 Sep 2004 19:48:09 -0000	1.3
@@ -112,8 +112,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -216,7 +216,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -418,7 +418,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -437,8 +437,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 	$(INSTALL_DATA) jpegtclConfig.sh $(DESTDIR)$(libdir)
Index: libjpeg/tcl/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/libjpeg/tcl/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- libjpeg/tcl/pkgIndex.tcl.in	26 Sep 2004 10:37:15 -0000	1.1.1.1
+++ libjpeg/tcl/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,12 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/19 00:28:54 andreas_kupries Exp $
 
-package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir @jpegtcl_LIB_FILE@]]
-
-# distinguish static and dyn variants, later.
-if {0} {
-package ifneeded @PACKAGE@ @VERSION@ [string map [list @dir@ $dir] \
-"if {[catch {load [file join @dir@ @jpegtcl_LIB_FILE@]}]} {
-    load [file join @dir@ @jpegtcl_LIB_FILE@]
-}"]
-}
+package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir .. .. .. lib tcl @jpegtcl_LIB_FILE@]]
Index: libpng/tcl/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/libpng/tcl/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libpng/tcl/Makefile.in	26 Sep 2004 15:37:17 -0000	1.2
+++ libpng/tcl/Makefile.in	26 Sep 2004 19:48:09 -0000	1.3
@@ -112,8 +112,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -217,7 +217,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -419,7 +419,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -438,8 +438,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 	$(INSTALL_DATA) pngtclConfig.sh $(DESTDIR)$(libdir)
Index: libpng/tcl/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/libpng/tcl/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- libpng/tcl/pkgIndex.tcl.in	26 Sep 2004 10:37:16 -0000	1.1.1.1
+++ libpng/tcl/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,12 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/19 00:28:54 andreas_kupries Exp $
 
-package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir @pngtcl_LIB_FILE@]]
-
-# distinguish static and dyn variants, later.
-if {0} {
-package ifneeded @PACKAGE@ @VERSION@ [string map [list @dir@ $dir] \
-"if {[catch {load [file join @dir@ @pngtcl_LIB_FILE@]}]} {
-    load [file join @dir@ @pngtcl_LIB_FILE@]
-}"]
-}
+package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir .. .. .. lib tcl @pngtcl_LIB_FILE@]]
Index: libtiff/tcl/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/libtiff/tcl/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtiff/tcl/Makefile.in	26 Sep 2004 15:37:16 -0000	1.2
+++ libtiff/tcl/Makefile.in	26 Sep 2004 19:48:09 -0000	1.3
@@ -112,8 +112,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -216,7 +216,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -425,7 +425,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -444,8 +444,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 	$(INSTALL_DATA) tifftclConfig.sh $(DESTDIR)$(libdir)
Index: libtiff/tcl/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/libtiff/tcl/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- libtiff/tcl/pkgIndex.tcl.in	26 Sep 2004 10:37:17 -0000	1.1.1.1
+++ libtiff/tcl/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,12 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/19 00:28:54 andreas_kupries Exp $
 
-package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir @tifftcl_LIB_FILE@]]
-
-# distinguish static and dyn variants, later.
-if {0} {
-package ifneeded @PACKAGE@ @VERSION@ [string map [list @dir@ $dir] \
-"if {[catch {load [file join @dir@ @tifftcl_LIB_FILE@]}]} {
-    load [file join @dir@ @tifftcl_LIB_FILE@]
-}"]
-}
+package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir .. .. .. lib tcl @tifftcl_LIB_FILE@]]
Index: libz/tcl/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/libz/tcl/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- libz/tcl/Makefile.in	26 Sep 2004 10:37:18 -0000	1.1.1.1
+++ libz/tcl/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -119,8 +119,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -425,7 +425,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -444,8 +444,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 	$(INSTALL_DATA) zlibtclConfig.sh $(DESTDIR)$(libdir)
Index: libz/tcl/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/libz/tcl/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- libz/tcl/pkgIndex.tcl.in	26 Sep 2004 10:37:18 -0000	1.1.1.1
+++ libz/tcl/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,12 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/19 00:28:55 andreas_kupries Exp $
 
-package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir @zlibtcl_LIB_FILE@]]
-
-# distinguish static and dyn variants, later.
-if {0} {
-package ifneeded @PACKAGE@ @VERSION@ [string map [list @dir@ $dir] \
-"if {[catch {load [file join @dir@ @zlibtcl_LIB_FILE@]}]} {
-    load [file join @dir@ @zlibtcl_LIB_FILE@]
-}"]
-}
+package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir .. .. .. lib tcl @zlibtcl_LIB_FILE@]]
Index: pcx/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/pcx/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pcx/Makefile.in	26 Sep 2004 10:37:18 -0000	1.1.1.1
+++ pcx/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgpcxConfig.sh $(DESTDIR)$(libdir)
Index: pcx/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/pcx/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pcx/pkgIndex.tcl.in	26 Sep 2004 10:37:18 -0000	1.1.1.1
+++ pcx/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:07 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgpcx_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgpcx_LIB_FILE@]]
Index: pixmap/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/pixmap/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pixmap/Makefile.in	26 Sep 2004 10:37:18 -0000	1.1.1.1
+++ pixmap/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -235,7 +235,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -441,7 +441,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -460,8 +460,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgpixmapConfig.sh $(DESTDIR)$(libdir)
Index: pixmap/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/pixmap/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pixmap/pkgIndex.tcl.in	26 Sep 2004 10:37:18 -0000	1.1.1.1
+++ pixmap/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/12/05 07:08:42 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgpixmap_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgpixmap_LIB_FILE@]]
Index: png/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/png/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- png/Makefile.in	26 Sep 2004 17:01:39 -0000	1.2
+++ png/Makefile.in	26 Sep 2004 19:48:09 -0000	1.3
@@ -114,8 +114,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -241,7 +241,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -448,7 +448,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -467,8 +467,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgpngConfig.sh $(DESTDIR)$(libdir)
Index: png/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/png/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- png/pkgIndex.tcl.in	26 Sep 2004 10:37:18 -0000	1.1.1.1
+++ png/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 08:57:56 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgpng_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgpng_LIB_FILE@]]
Index: ppm/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/ppm/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ppm/Makefile.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ ppm/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgppmConfig.sh $(DESTDIR)$(libdir)
Index: ppm/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/ppm/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ppm/pkgIndex.tcl.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ ppm/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:07 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgppm_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgppm_LIB_FILE@]]
Index: ps/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/ps/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ps/Makefile.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ ps/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -231,7 +231,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -440,7 +440,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -459,8 +459,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgpsConfig.sh $(DESTDIR)$(libdir)
Index: ps/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/ps/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ps/pkgIndex.tcl.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ ps/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:07 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgps_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgps_LIB_FILE@]]
Index: sgi/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/sgi/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sgi/Makefile.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ sgi/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgsgiConfig.sh $(DESTDIR)$(libdir)
Index: sgi/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/sgi/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sgi/pkgIndex.tcl.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ sgi/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:08 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgsgi_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgsgi_LIB_FILE@]]
Index: sun/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/sun/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sun/Makefile.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ sun/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgsunConfig.sh $(DESTDIR)$(libdir)
Index: sun/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/sun/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sun/pkgIndex.tcl.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ sun/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:08 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgsun_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgsun_LIB_FILE@]]
Index: tga/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/tga/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tga/Makefile.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ tga/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgtgaConfig.sh $(DESTDIR)$(libdir)
Index: tga/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/tga/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tga/pkgIndex.tcl.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ tga/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:08 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgtga_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgtga_LIB_FILE@]]
Index: tiff/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/tiff/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tiff/Makefile.in	26 Sep 2004 15:37:16 -0000	1.2
+++ tiff/Makefile.in	26 Sep 2004 19:48:09 -0000	1.3
@@ -121,8 +121,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -251,7 +251,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -458,7 +458,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -477,8 +477,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgtiffConfig.sh $(DESTDIR)$(libdir)
Index: tiff/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/tiff/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tiff/pkgIndex.tcl.in	26 Sep 2004 10:37:19 -0000	1.1.1.1
+++ tiff/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 08:57:56 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgtiff_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgtiff_LIB_FILE@]]
Index: window/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/window/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- window/Makefile.in	26 Sep 2004 10:37:21 -0000	1.1.1.1
+++ window/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -234,7 +234,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -442,7 +442,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -461,8 +461,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgwindowConfig.sh $(DESTDIR)$(libdir)
Index: window/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/window/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- window/pkgIndex.tcl.in	26 Sep 2004 10:37:21 -0000	1.1.1.1
+++ window/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 08:57:56 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgwindow_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgwindow_LIB_FILE@]]
Index: xbm/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/xbm/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xbm/Makefile.in	26 Sep 2004 10:37:22 -0000	1.1.1.1
+++ xbm/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgxbmConfig.sh $(DESTDIR)$(libdir)
Index: xbm/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/xbm/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xbm/pkgIndex.tcl.in	26 Sep 2004 10:37:22 -0000	1.1.1.1
+++ xbm/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:08 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgxbm_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgxbm_LIB_FILE@]]
Index: xpm/Makefile.in
===================================================================
RCS file: /var/cvs/modules/tkimg/xpm/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xpm/Makefile.in	26 Sep 2004 10:37:23 -0000	1.1.1.1
+++ xpm/Makefile.in	26 Sep 2004 19:48:09 -0000	1.2
@@ -110,8 +110,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -230,7 +230,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -437,7 +437,7 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -456,8 +456,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done
 ##	$(INSTALL_DATA) tkimgxpmConfig.sh $(DESTDIR)$(libdir)
Index: xpm/pkgIndex.tcl.in
===================================================================
RCS file: /var/cvs/modules/tkimg/xpm/pkgIndex.tcl.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xpm/pkgIndex.tcl.in	26 Sep 2004 10:37:23 -0000	1.1.1.1
+++ xpm/pkgIndex.tcl.in	26 Sep 2004 19:56:42 -0000	1.2
@@ -2,4 +2,4 @@
 #
 # $Id: pkgIndex.tcl.in,v 1.1 2002/11/29 05:46:08 andreas_kupries Exp $
 
-package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir @tkimgxpm_LIB_FILE@]]
+package ifneeded "@DPACKAGE@" @VERSION@ [list load [file join $dir .. .. .. lib tcl @tkimgxpm_LIB_FILE@]]
 
projeto & código: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
mantenedor atual: Michael Shigorin
mantenedor da tradução: Fernando Martini aka fmartini © 2009