diff options
Diffstat (limited to 'itcl/itcl/win/Makefile.in')
| -rw-r--r-- | itcl/itcl/win/Makefile.in | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/itcl/itcl/win/Makefile.in b/itcl/itcl/win/Makefile.in index a9cb288f6da..7b5c18ff026 100644 --- a/itcl/itcl/win/Makefile.in +++ b/itcl/itcl/win/Makefile.in @@ -12,6 +12,11 @@ prefix = @prefix@ 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@ @@ -82,21 +87,21 @@ ITCLSHRES = @ITCLSHRES@ # 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 @@ -219,7 +224,7 @@ $(CYGITCLTEST): $(ITCLTESTOBJS) $(CYGITCLLIB) $(TMPDIR)/$(CYGITCLSHRES) $(CC) $(linkdebug) $(conlflags) -Wl,--stack=0x2300000 \ $(ITCL_CFLAGS) \ $(ITCLTESTOBJS) $(TMPDIR)/$(CYGITCLSHRES) \ - $(CYGITCLLIB) $(TCLLIBDIR)/$(TCLLIB) $(conlibsdll) \ + $(CYGITCLLIB) $(TCLLIBDIR)/$(TCLLIB) $(conlibsdll) \ -o $(CYGITCLTEST) $(TMPDIR)/$(CYGITCLSHRES):: $(ROOT)/win/itclsh.rc @@ -306,7 +311,7 @@ config.status: $(srcdir)/configure install:: install-basic install-binaries @echo done -install-binaries:: +install-binaries:: install-shared-libraries @for i in $(INSTALL_LIB_DIR) $(INSTALL_BIN_DIR) ; \ do \ if [ ! -d $$i ] ; then \ @@ -316,12 +321,10 @@ install-binaries:: else true; \ fi; \ done; - @echo "Installing $(CYGITCLLIB) as $(INSTALL_LIB_DIR)/$(CYGITCLLIB)" - @$(INSTALL_DATA) $(CYGITCLLIB) $(INSTALL_LIB_DIR)/$(CYGITCLLIB) - @echo "Installing $(CYGITCLSH) as $(INSTALL_BIN_DIR)/$(CYGITCLSH)" - @$(INSTALL_PROGRAM) $(CYGITCLSH) $(INSTALL_BIN_DIR)/$(CYGITCLSH) - @echo "Installing $(CYGITCLDLL) as $(INSTALL_BIN_DIR)/$(CYGITCLDLL)" - @$(INSTALL_PROGRAM) $(CYGITCLDLL) $(INSTALL_BIN_DIR)/$(CYGITCLDLL) + @echo "Installing $(ITCLLIB) as $(INSTALL_LIB_DIR)/$(ITCLLIB)" + @$(INSTALL_DATA) $(ITCLLIB) $(INSTALL_LIB_DIR)/$(ITCLLIB) + @echo "Installing $(ITCLSH) as $(INSTALL_BIN_DIR)/$(ITCLSH)" + @$(INSTALL_PROGRAM) $(ITCLSH) $(INSTALL_BIN_DIR)/$(ITCLSH) # # Basic installtion @@ -346,7 +349,7 @@ install-headers: $(INSTALL_DATA) $$i $(INSTALL_INCLUDE_DIR); \ done; -install-libraries: +install-libraries: install-shared-libraries @for i in $(prefix)/lib $(ITCL_LIBRARY); \ do \ if [ ! -d $$i ] ; then \ @@ -360,6 +363,9 @@ install-libraries: @$(INSTALL_DATA) $(srcdir)/pkgIndex.tcl $(ITCL_LIBRARY) @$(INSTALL_DATA) $(srcdir)/../library/itcl.tcl $(ITCL_LIBRARY) +install-shared-libraries: + @echo "Installing $(ITCLDLL) as $(INSTALL_BIN_DIR)/$(ITCLDLL)" + @$(INSTALL_PROGRAM) $(ITCLDLL) $(INSTALL_BIN_DIR)/$(ITCLDLL) install-man: @for i in $(INSTALL_MAN_DIR) $(INSTALL_MAN1_DIR) \ |