From 24255fc79b6895f66c03b0c9792f055219069f3b Mon Sep 17 00:00:00 2001 From: "Vladimir D. Seleznev" Date: Mon, 16 Sep 2019 19:24:50 +0300 Subject: [PATCH] ALT: TEA --- tkimg/Makefile.in | 4 ++-- tkimg/base/Makefile.in | 4 ++-- tkimg/bmp/Makefile.in | 4 ++-- tkimg/dted/Makefile.in | 4 ++-- tkimg/gif/Makefile.in | 4 ++-- tkimg/ico/Makefile.in | 4 ++-- tkimg/jpeg/Makefile.in | 4 ++-- tkimg/libjpeg/Makefile.in | 4 ++-- tkimg/libpng/Makefile.in | 4 ++-- tkimg/libtiff/Makefile.in | 4 ++-- tkimg/pcx/Makefile.in | 4 ++-- tkimg/pixmap/Makefile.in | 4 ++-- tkimg/png/Makefile.in | 4 ++-- tkimg/ppm/Makefile.in | 4 ++-- tkimg/ps/Makefile.in | 4 ++-- tkimg/raw/Makefile.in | 4 ++-- tkimg/sgi/Makefile.in | 4 ++-- tkimg/sun/Makefile.in | 4 ++-- tkimg/tga/Makefile.in | 4 ++-- tkimg/tiff/Makefile.in | 4 ++-- tkimg/window/Makefile.in | 4 ++-- tkimg/xbm/Makefile.in | 4 ++-- tkimg/xpm/Makefile.in | 4 ++-- tkimg/zlib/Makefile.in | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/tkimg/Makefile.in b/tkimg/Makefile.in index 7c640612..adf65fde 100755 --- a/tkimg/Makefile.in +++ b/tkimg/Makefile.in @@ -54,10 +54,10 @@ INSTALL_LIBRARY = ${INSTALL_DATA} # to be different than those used for actually reference files at # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix # when installing files. -INSTALL_ROOT = +INSTALL_ROOT = ${DESTDIR} # Directory where libimg.a is at run-time: -LIB_RUNTIME_DIR = $(libdir)/$(PACKAGE_NAME)$(PACKAGE_VERSION) +LIB_RUNTIME_DIR = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) # Directory in which to install the archive libimg.a: LIB_INSTALL_DIR = $(INSTALL_ROOT)$(LIB_RUNTIME_DIR) diff --git a/tkimg/base/Makefile.in b/tkimg/base/Makefile.in index f19d83d1..8b8369f5 100755 --- a/tkimg/base/Makefile.in +++ b/tkimg/base/Makefile.in @@ -80,8 +80,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/bmp/Makefile.in b/tkimg/bmp/Makefile.in index dbbc1211..e4d2d4ba 100755 --- a/tkimg/bmp/Makefile.in +++ b/tkimg/bmp/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/dted/Makefile.in b/tkimg/dted/Makefile.in index 3362e967..be98a8aa 100755 --- a/tkimg/dted/Makefile.in +++ b/tkimg/dted/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/gif/Makefile.in b/tkimg/gif/Makefile.in index d610cc23..62f693ce 100755 --- a/tkimg/gif/Makefile.in +++ b/tkimg/gif/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/ico/Makefile.in b/tkimg/ico/Makefile.in index daad735e..bfd7c6f4 100755 --- a/tkimg/ico/Makefile.in +++ b/tkimg/ico/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/jpeg/Makefile.in b/tkimg/jpeg/Makefile.in index 33a4dbdc..2ef5986a 100755 --- a/tkimg/jpeg/Makefile.in +++ b/tkimg/jpeg/Makefile.in @@ -90,8 +90,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/libjpeg/Makefile.in b/tkimg/libjpeg/Makefile.in index d89e0f71..5c122764 100755 --- a/tkimg/libjpeg/Makefile.in +++ b/tkimg/libjpeg/Makefile.in @@ -80,8 +80,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/libpng/Makefile.in b/tkimg/libpng/Makefile.in index 2ec7d9d6..b6ffc33f 100755 --- a/tkimg/libpng/Makefile.in +++ b/tkimg/libpng/Makefile.in @@ -84,8 +84,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/libtiff/Makefile.in b/tkimg/libtiff/Makefile.in index 3b013c65..2b9286e6 100755 --- a/tkimg/libtiff/Makefile.in +++ b/tkimg/libtiff/Makefile.in @@ -82,8 +82,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/pcx/Makefile.in b/tkimg/pcx/Makefile.in index e88562fc..737ad079 100755 --- a/tkimg/pcx/Makefile.in +++ b/tkimg/pcx/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/pixmap/Makefile.in b/tkimg/pixmap/Makefile.in index 5ae01146..5e64764a 100755 --- a/tkimg/pixmap/Makefile.in +++ b/tkimg/pixmap/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/png/Makefile.in b/tkimg/png/Makefile.in index 24878155..19a64be2 100755 --- a/tkimg/png/Makefile.in +++ b/tkimg/png/Makefile.in @@ -94,8 +94,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/ppm/Makefile.in b/tkimg/ppm/Makefile.in index 132b5987..43c92109 100755 --- a/tkimg/ppm/Makefile.in +++ b/tkimg/ppm/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/ps/Makefile.in b/tkimg/ps/Makefile.in index 5a0ba5f8..b86aa208 100755 --- a/tkimg/ps/Makefile.in +++ b/tkimg/ps/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/raw/Makefile.in b/tkimg/raw/Makefile.in index a75be030..d1eee853 100755 --- a/tkimg/raw/Makefile.in +++ b/tkimg/raw/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/sgi/Makefile.in b/tkimg/sgi/Makefile.in index 4323e73b..dbe5193b 100755 --- a/tkimg/sgi/Makefile.in +++ b/tkimg/sgi/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/sun/Makefile.in b/tkimg/sun/Makefile.in index 4a273d37..08f300f9 100755 --- a/tkimg/sun/Makefile.in +++ b/tkimg/sun/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/tga/Makefile.in b/tkimg/tga/Makefile.in index 7a2e278e..9c5fc192 100755 --- a/tkimg/tga/Makefile.in +++ b/tkimg/tga/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/tiff/Makefile.in b/tkimg/tiff/Makefile.in index 1c5d77cf..114af382 100755 --- a/tkimg/tiff/Makefile.in +++ b/tkimg/tiff/Makefile.in @@ -98,8 +98,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/window/Makefile.in b/tkimg/window/Makefile.in index b826eb93..0ca789f5 100755 --- a/tkimg/window/Makefile.in +++ b/tkimg/window/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/xbm/Makefile.in b/tkimg/xbm/Makefile.in index bd7fa072..2ec5fe74 100755 --- a/tkimg/xbm/Makefile.in +++ b/tkimg/xbm/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/xpm/Makefile.in b/tkimg/xpm/Makefile.in index dbbc1211..e4d2d4ba 100755 --- a/tkimg/xpm/Makefile.in +++ b/tkimg/xpm/Makefile.in @@ -86,8 +86,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . diff --git a/tkimg/zlib/Makefile.in b/tkimg/zlib/Makefile.in index df0b254f..703f2272 100755 --- a/tkimg/zlib/Makefile.in +++ b/tkimg/zlib/Makefile.in @@ -80,8 +80,8 @@ mandir = @mandir@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) +pkgdatadir = $(datadir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) +pkglibdir = $(libdir)/tcl/$(PACKAGE_NAME)$(PACKAGE_VERSION) pkgincludedir = $(includedir)/$(PKG_DIR) top_builddir = . -- 2.33.7