+Tue Jun 6 22:09:02 2000 Christopher Faylor <cgf@cygnus.com>
+
+ * itcl/win/Makefile.in: Set up and use autoconf variables throughout to
+ allow overriding variables from the make command line.
+ * itk/win/Makefile.in: Ditto.
+ * itcl/iwidgets3.0.0/unix/Makefile.in: Ditto.
+
2000-05-03 Syd Polk <spolk@redhat.com>
* Makefile.in (check test): Call "make test" explicitly when
exec_prefix = @exec_prefix@
VPATH = @srcdir@:@srcdir@/../generic:@srcdir@/../unix
srcdir = @srcdir@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+mandir=@mandir@
+datadir=@datadir@
CC = @CC@
CFLAGS = @CFLAGS@
# Directory in which to install the library of Itcl scripts and demos
# (note: you can set the ITCL_LIBRARY environment variable at run-time to
# override the compiled-in location):
-ITCL_LIBRARY = $(prefix)/share/itcl$(ITCL_VERSION)
+ITCL_LIBRARY = $(datadir)/itcl$(ITCL_VERSION)
-# CYGNUS LOCAL: dj - use @dir@ form
+# CYGNUS LOCAL: cgf - use autoconf variables
# Directory in which to install the archive libitcl.a:
-INSTALL_LIB_DIR = @libdir@
+INSTALL_LIB_DIR = $(libdir)
# Directory in which to install the program itclsh:
-INSTALL_BIN_DIR = @bindir@
+INSTALL_BIN_DIR = $(bindir)
# Directory in which to install the include file itcl.h:
-INSTALL_INCLUDE_DIR = @includedir@
+INSTALL_INCLUDE_DIR = $(includedir)
# Top-level directory for manual entries:
-INSTALL_MAN_DIR = @mandir@
+INSTALL_MAN_DIR = $(mandir)
# Directory in which to install manual entry for itclsh:
INSTALL_MAN1_DIR = $(INSTALL_MAN_DIR)/man1
exec_prefix = @exec_prefix@
VPATH = @srcdir@:@srcdir@/../generic:@srcdir@/../unix
srcdir = @srcdir@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+mandir=@mandir@
+datadir=@datadir@
CC = @CC@
CFLAGS = @CFLAGS@
ITK_LIBRARY = $(prefix)/share/itk$(ITCL_VERSION)
# Directory in which to install the archive libitcl.a:
-INSTALL_LIB_DIR = @libdir@
+INSTALL_LIB_DIR = $(libdir)
# Directory in which to install the program itclsh:
-INSTALL_BIN_DIR = @bindir@
+INSTALL_BIN_DIR = $(bindir)
# Directory in which to install the include file itcl.h:
-INSTALL_INCLUDE_DIR = @includedir@
+INSTALL_INCLUDE_DIR = $(includedir)
# Top-level directory for manual entries:
-INSTALL_MAN_DIR = @mandir@
+INSTALL_MAN_DIR = $(mandir)
# Directory in which to install manual entry for itclsh:
INSTALL_MAN1_DIR = $(INSTALL_MAN_DIR)/man1
prefix = @prefix@
exec_prefix = @exec_prefix@
+srcdir = @srcdir@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+mandir=@mandir@
+datadir=@datadir@
# The following definition can be set to non-null for special systems
# like AFS with replication. It allows the pathnames used for installation
# Directory from which applications will reference the library of
# [incr Widgets] scripts (note: you can set the IWIDGETS_LIBRARY environment
# variable at run-time to override this value):
-IWIDGETS_LIBRARY = $(prefix)/share/iwidgets$(VERSION)
+IWIDGETS_LIBRARY = $(datadir)/iwidgets$(VERSION)
# END CYGNUS LOCAL
# Path name to use when installing library scripts:
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(IWIDGETS_LIBRARY)
# Directory in which to install the archive libtcl.a:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the program tclsh:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the include file itcl.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
# Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
# Directory in which to install manual entry for itclsh:
MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
TCL_LIB_DIR = @TCL_LIB_DIR@
# Directory containing Tcl source code (for library used during test):
-TCL_SRC_DIR = @TCL_SRC_DIR@
+TCL_SRC_DIR = ${srcdir}/../../../../tcl
# Tk libraries can be found here:
TK_LIB_DIR = @TK_LIB_DIR@
# Directory containing Tk source code (for library used during test):
-TK_SRC_DIR = @TK_SRC_DIR@
+TK_SRC_DIR = ${srcdir}/../../../tk
# Itcl libraries can be found here:
ITCL_LIB_DIR = @ITCL_LIB_DIR@
# Directory containing Itcl source code (for library used during test):
-ITCL_SRC_DIR = @ITCL_SRC_DIR@
+ITCL_SRC_DIR = ${srcdir}/../../itcl
# Itk libraries can be found here:
ITK_LIB_DIR = @ITK_LIB_DIR@
# Directory containing Itk source code (for library used during test):
-ITK_SRC_DIR = @ITK_SRC_DIR@
+ITK_SRC_DIR = ${srcdir}/../../itk
# [incr Tk] build directory containing the itkwish binary for 'make test'
ITK_BIN_DIR = ../../itk/unix
+Tue Jun 6 22:09:02 2000 Christopher Faylor <cgf@cygnus.com>
+
+ * win/Makefile.in: Set up and use autoconf variables throughout to
+ allow overriding variables from the make command line.
+
Tue Jun 6 12:17:46 2000 Christopher Faylor <cgf@cygnus.com>
* generic/tclFilename.c (Tcl_TranslateFileName): Reinstate Mon Jun 5
exec_prefix = @exec_prefix@
VPATH = @srcdir@:@srcdir@/../generic:@srcdir@/../compat
srcdir = @srcdir@
+libdir = @libdir@
+bindir = @bindir@
+includedir = @includedir@
+datadir = @datadir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
# Directory from which applications will reference the library of Tcl
# scripts (note: you can set the TCL_LIBRARY environment variable at
# run-time to override this value):
-TCL_LIBRARY = @datadir@/tcl$(DIRVERSION)
+TCL_LIBRARY = $(datadir)/tcl$(DIRVERSION)
# Path name to use when installing library scripts:
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
# Directory in which to install libtcl.so or libtcl.a:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)@libdir@
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the program tclsh:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)@bindir@
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the include file tcl.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)@includedir@
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
#
# Visual C++ 2.x and 4.0 makefile
+Tue Jun 6 22:09:02 2000 Christopher Faylor <cgf@cygnus.com>
+
+ * win/Makefile.in: Set up and use autoconf variables throughout to
+ allow overriding variables from the make command line.
+
2000-01-26 DJ Delorie <dj@cygnus.com>
* win/tixWCmpt.c (DllMain): Use _imp__ instead of __imp_
exec_prefix = @exec_prefix@
VPATH = @srcdir@:@srcdir@/../generic
srcdir = @srcdir@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+mandir=@mandir@
+datadir=@datadir@
+host_alias=@host_alias@
CC = @CC@
CFLAGS = @CFLAGS@
# 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 = $(prefix)/share/tix$(TIX_VERSION)
+TIX_LIBRARY = $(datadir)/tix$(TIX_VERSION)
# CYGNUS LOCAL: dj - change to autoconf'd directories
# Directory in which to install the archive libtix.a:
-LIB_DIR = @libdir@
+LIB_DIR = $(libdir)
# Directory in which to install the program wish:
-BIN_DIR = @bindir@
+BIN_DIR = $(bindir)
# Directory in which to install the include file tix.h:
-INCLUDE_DIR = @includedir@
+INCLUDE_DIR = $(includedir)
# Top-level directory for manual entries:
-MAN_DIR = @mandir@
+MAN_DIR = $(mandir)
# Directory in which to install manual entry for wish:
MAN1_DIR = $(MAN_DIR)/man1
+Tue Jun 6 22:09:02 2000 Christopher Faylor <cgf@cygnus.com>
+
+ * win/Makefile.in: Set up and use autoconf variables throughout to
+ allow overriding variables from the make command line.
+
2000-01-26 DJ Delorie <dj@cygnus.com>
* win/tkWin32Dll.c (DllMain): Use _imp__ instead of __imp_
prefix = @prefix@
exec_prefix = @exec_prefix@
-VPATH = @srcdir@:@srcdir@/../xlib:@srcdir@/../generic:@srcdir@/../unix:@srcdir@/../win/rc
srcdir = @srcdir@
+VPATH = $(srcdir):$(srcdir)/../xlib:$(srcdir)/../generic:$(srcdir)/../unix:$(srcdir)/../win/rc
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+mandir=@mandir@
+datadir=@datadir@
+host_alias=@host_alias@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
# Directory from which applications will reference the library of Tcl
# scripts (note: you can set the TK_LIBRARY environment variable at
# run-time to override the compiled-in location):
-TK_LIBRARY = @datadir@/tk$(DIRVERSION)
+TK_LIBRARY = $(datadir)/tk$(DIRVERSION)
# Path name to use when installing library scripts:
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)
# Directory in which to install the .a or .so binary for the Tk library:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)@libdir@
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the program wish:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)@bindir@
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the include file tk.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)@includedir@
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
# Directory in which to install the X11 header files. These files are
# not machine independent, so they should not go in includedir.
-X11_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)@exec_prefix@/@host_alias@/include/X11
+X11_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/X11
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
OSDN Git Service
