155 lines
4.7 KiB
Diff
155 lines
4.7 KiB
Diff
--- generic/tixDef.h
|
|
+++ generic/tixDef.h
|
|
@@ -19,9 +19,7 @@
|
|
/*
|
|
* Include the defaults of the TK distriburion
|
|
*/
|
|
-#ifndef _DEFAULT
|
|
-#include <default.h>
|
|
-#endif
|
|
+#include <tkUnixDefault.h>
|
|
|
|
#ifndef CTL_FONT
|
|
#define CTL_FONT "Helvetica -12 bold"
|
|
--- unix/Makefile.in
|
|
+++ unix/Makefile.in
|
|
@@ -1,4 +1,4 @@
|
|
-# -*-mode: makefile; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*-
|
|
+# -*-mode: makefile; fill-column: 75; tab-width: 8; coding: iso-8859-1 -*-
|
|
#
|
|
# $Id: Makefile.in,v 1.2.2.5 2002/12/02 04:02:52 idiscovery Exp $
|
|
#
|
|
@@ -16,6 +16,8 @@
|
|
# the configuration script).
|
|
#----------------------------------------------------------------
|
|
|
|
+DESTDIR=
|
|
+
|
|
# Default top-level directories in which to install architecture-
|
|
# specific files (exec_prefix) and machine-independent files such
|
|
# as scripts (prefix). The values specified here may be overridden
|
|
@@ -24,7 +26,10 @@
|
|
|
|
prefix = @prefix@
|
|
exec_prefix = @exec_prefix@
|
|
-libdir = $(exec_prefix)/lib
|
|
+libdir = @libdir@
|
|
+mandir = @mandir@
|
|
+tclscriptdir = $(libdir)
|
|
+
|
|
|
|
@SET_MAKE@
|
|
|
|
@@ -33,19 +38,19 @@
|
|
# Directory in which to install the library of Tix scripts and demos
|
|
# (note: you can set the TIX_LIBRARY environment variable at run-time to
|
|
# override the compiled-in location):
|
|
-TIX_LIBRARY = $(libdir)/tix$(TIX_VERSION)
|
|
+TIX_LIBRARY = $(DESTDIR)$(tclscriptdir)/tix$(TIX_VERSION)
|
|
|
|
# Directory in which to install the archive libtix.a:
|
|
-LIB_DIR = $(exec_prefix)/lib
|
|
+LIB_DIR = $(DESTDIR)$(libdir)
|
|
|
|
# Directory in which to install the program wish:
|
|
-BIN_DIR = $(exec_prefix)/bin
|
|
+BIN_DIR = $(DESTDIR)$(exec_prefix)/bin
|
|
|
|
# Directory in which to install the include file tix.h:
|
|
-INCLUDE_DIR = $(prefix)/include
|
|
+INCLUDE_DIR = $(DESTDIR)$(prefix)/include
|
|
|
|
# Top-level directory for manual entries:
|
|
-MAN_DIR = $(prefix)/man
|
|
+MAN_DIR = $(DESTDIR)$(mandir)
|
|
|
|
# Directory in which to install manual entry for wish:
|
|
MAN1_DIR = $(MAN_DIR)/man1
|
|
--- unix/tk8.4/Makefile.in
|
|
+++ unix/tk8.4/Makefile.in
|
|
@@ -1,4 +1,4 @@
|
|
-# -*-mode: makefile; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*-
|
|
+# -*-mode: makefile; fill-column: 75; tab-width: 8; coding: iso-8859-1 -*-
|
|
#
|
|
# $Id: Makefile.in,v 1.1.2.3 2002/12/11 07:18:41 idiscovery Exp $
|
|
#
|
|
@@ -22,6 +22,8 @@
|
|
# the configuration script).
|
|
#----------------------------------------------------------------
|
|
|
|
+DESTDIR=
|
|
+
|
|
# Default top-level directories in which to install architecture-
|
|
# specific files (exec_prefix) and machine-independent files such
|
|
# as scripts (prefix). The values specified here may be overridden
|
|
@@ -29,8 +31,9 @@
|
|
# to the "configure" script.
|
|
|
|
prefix = @prefix@
|
|
+mandir = @mandir@
|
|
exec_prefix = @exec_prefix@
|
|
-libdir = $(exec_prefix)/lib
|
|
+libdir = @libdir@
|
|
|
|
TIX_VERSION = @TIX_VERSION@
|
|
TCL_VERSION = @TCL_VERSION@
|
|
@@ -40,15 +43,15 @@
|
|
# Directory in which to install the library of Tix scripts and demos
|
|
# (note: you can set the TIX_LIBRARY environment variable at run-time to
|
|
# override the compiled-in location):
|
|
-TIX_LIBRARY = $(libdir)/tix$(TIX_VERSION)
|
|
+TIX_LIBRARY = $(DESTDIR)$(libdir)/tix$(TIX_VERSION)
|
|
|
|
# Directory in which to install the archive libtix.a:
|
|
-LIB_DIR = $(exec_prefix)/lib
|
|
+LIB_DIR = $(DESTDIR)$(libdir)
|
|
LIB_INSTALL_DIR = $(LIB_DIR)
|
|
LIB_RUNTIME_DIR = $(LIB_DIR)
|
|
|
|
# Directory in which to install the program tixwish:
|
|
-BIN_DIR = $(exec_prefix)/bin
|
|
+BIN_DIR = $(DESTDIR)$(exec_prefix)/bin
|
|
|
|
# To change the compiler switches, for example to change from -O
|
|
# to -g, change the following line:
|
|
@@ -497,7 +500,7 @@
|
|
fi; \
|
|
done;
|
|
@echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)"
|
|
- @$(INSTALL_DATA) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
|
|
+ @$(INSTALL_PROGRAM) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
|
|
@echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)"
|
|
@$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE)
|
|
@echo "Installing tixConfig.sh"
|
|
--- unix/tk8.4/configure.in
|
|
+++ unix/tk8.4/configure.in
|
|
@@ -128,11 +128,11 @@
|
|
if test "$ok" = "yes"; then
|
|
TIX_BUILD_SAM="yes"
|
|
TIX_SAM_TARGETS='$(SAM_TARGETS)'
|
|
+ TIX_SAM_INSTALL=_install_sam_lib_
|
|
else
|
|
TIX_BUILD_SAM="no"
|
|
fi
|
|
|
|
- TIX_SAM_INSTALL=_install_sam_lib_
|
|
|
|
IS_ITCL=0
|
|
ITCL_BUILD_LIB_SPEC=""
|
|
@@ -348,12 +348,12 @@
|
|
AC_SUBST(TIX_VERSION_PKG)
|
|
|
|
TIXSAM_PKG_FILE="[[file join [file dirname \$dir] ${TIX_SAM_FILE}]]"
|
|
-# if test "$TIX_BUILD_SAM" = "yes"; then
|
|
+if test "$TIX_BUILD_SAM" = "yes"; then
|
|
TIX_SAM_PACKAGE_IFNEEDED="package ifneeded Tixsam ${TIX_VERSION_PKG} [[list load \"${TIXSAM_PKG_FILE}\" Tixsam]]"
|
|
-# fi
|
|
+fi
|
|
|
|
# The package file, usually a shared library
|
|
-TIX_PKG_FILE="[[file join [file dirname \$dir] ${TIX_LIB_FILE}]]"
|
|
+TIX_PKG_FILE="${TIX_LIB_FILE}"
|
|
AC_SUBST(TIX_PKG_FILE)
|
|
AC_SUBST(TIX_SAM_PACKAGE_IFNEEDED)
|
|
|