Check-in [7781365c5e]
Overview
SHA1:7781365c5e7aa8413093a1b6698d9d41dc692582
Date: 2014-12-13 22:51:00
User: rkeene
Comment:Updated to use DESTDIR instead of INSTALL_ROOT (supporting both) and place libctk in the right directory
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2014-12-13
22:51
[197ac70ffe] Removed temporary file (user: rkeene, tags: trunk)
22:51
[7781365c5e] Updated to use DESTDIR instead of INSTALL_ROOT (supporting both) and place libctk in the right directory (user: rkeene, tags: trunk)
2012-07-19
00:25
[19a5c7951a] Updated to use newer mingw32 conventions (user: rkeene, tags: trunk)
Changes

Modified Makefile.in from [122cee2c73] to [bfd2062b08].

     6      6   # actual Makefile.
     7      7   #
     8      8   # @(#) $Id: ctk.shar,v 1.50 1996/01/15 14:47:16 andrewm Exp andrewm $
     9      9   
    10     10   # Current CTk version;  used in various names.
    11     11   
    12     12   VERSION = @PACKAGE_VERSION@
           13  +
           14  +# Compatability with old versions
           15  +DESTDIR := $(INSTALL_ROOT)
    13     16   
    14     17   #----------------------------------------------------------------
    15     18   # Things you can change to personalize the Makefile for your own
    16     19   # site (you can make these changes in either Makefile.in or
    17     20   # Makefile, but changes to Makefile will get lost if you re-run
    18     21   # the configuration script).
    19     22   #----------------------------------------------------------------
................................................................................
    23     26   # as scripts (prefix).  The values specified here may be overridden
    24     27   # at configure-time with the --exec-prefix and --prefix options
    25     28   # to the "configure" script.
    26     29   
    27     30   prefix =	@prefix@
    28     31   exec_prefix =	@exec_prefix@
    29     32   
    30         -# The following definition can be set to non-null for special systems
    31         -# like AFS with replication.  It allows the pathnames used for installation
    32         -# to be different than those used for actually reference files at
    33         -# run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
    34         -# when installing files.
    35         -INSTALL_ROOT =
    36         -
    37         -# Directory from which applications will reference the library of Tcl
    38         -# scripts (note: you can set the CTK_LIBRARY environment variable at
    39         -# run-time to override the compiled-in location):
    40         -CTK_LIBRARY =		$(prefix)/lib/ctk$(VERSION)
    41         -
    42     33   # Path name to use when installing library scripts:
    43         -SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(CTK_LIBRARY)
           34  +SCRIPT_INSTALL_DIR =	$(DESTDIR)$(CTK_LIBRARY)
    44     35   
    45     36   # Directory in which to install the archive libctk.a:
    46         -LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
           37  +LIB_INSTALL_DIR =	$(exec_prefix)/lib
    47     38   
    48     39   # Directory in which to install the program cwish:
    49         -BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
           40  +BIN_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/bin
    50     41   
    51     42   # Directory from which the program cwish should be referenced by scripts:
    52     43   BIN_DIR =		$(exec_prefix)/bin
    53     44   
    54     45   # Directory in which to install the include file ctk.h:
    55         -INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
           46  +INCLUDE_INSTALL_DIR =	$(DESTDIR)$(prefix)/include
    56     47   
    57     48   # Top-level directory for manual entries:
    58         -MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
           49  +MAN_INSTALL_DIR =	$(DESTDIR)$(prefix)/man
    59     50   
    60     51   # Directory in which to install manual entry for cwish:
    61     52   MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
           53  +
           54  +# Directory from which applications will reference the library of Tcl
           55  +# scripts (note: you can set the CTK_LIBRARY environment variable at
           56  +# run-time to override the compiled-in location):
           57  +CTK_LIBRARY =		$(LIB_INSTALL_DIR)/ctk$(VERSION)
    62     58   
    63     59   # Libraries to use when linking:  must include at least the
    64     60   # appropriate version of Tcl for this version of CTk, curses,
    65     61   # and the math library (in that order).  It is (hopefully) filled
    66     62   # in properly by the configure script.
    67     63   LIBS = @LIBS@
    68     64   
................................................................................
   182    178   libctk.@SHOBJEXT@: $(OBJS)
   183    179   	rm -f libctk.@SHOBJEXT@
   184    180   	$(CC) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o libctk.@SHOBJEXT@ $(OBJS) $(LIBS)
   185    181   
   186    182   install: install-binaries install-libraries install-demos install-man
   187    183   
   188    184   install-binaries: @TARGETS@
   189         -	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
          185  +	@for i in $(SCRIPT_INSTALL_DIR); \
   190    186   	    do \
   191    187   	    if [ ! -d $$i ] ; then \
   192    188   		echo "Making directory $$i"; \
   193         -		mkdir $$i; \
          189  +		mkdir -p $$i; \
   194    190   		chmod 755 $$i; \
   195    191   		else true; \
   196    192   		fi; \
   197    193   	    done;
   198    194   	@for target in @TARGETS@; do \
   199    195   		echo "Installing $${target}"; \
   200         -		$(INSTALL_PROGRAM) $${target} $(LIB_INSTALL_DIR); \
          196  +		$(INSTALL_PROGRAM) $${target} $(SCRIPT_INSTALL_DIR); \
   201    197   	done
   202         -	@$(INSTALL_DATA) pkgIndex.tcl $(LIB_INSTALL_DIR)
          198  +	@$(INSTALL_DATA) pkgIndex.tcl $(SCRIPT_INSTALL_DIR)
   203    199   
   204    200   install-libraries:
   205         -	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
          201  +	@for i in $(DESTDIR)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
   206    202   		$(SCRIPT_INSTALL_DIR) ; \
   207    203   	    do \
   208    204   	    if [ ! -d $$i ] ; then \
   209    205   		echo "Making directory $$i"; \
   210         -		mkdir $$i; \
          206  +		mkdir -p $$i; \
   211    207   		chmod 755 $$i; \
   212    208   		else true; \
   213    209   		fi; \
   214    210   	    done;
   215    211   	@echo "Installing ctk.h"
   216    212   	@$(INSTALL_DATA) $(SRC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/ctk.h
   217    213   	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex; \
   218    214   	    do \
   219    215   	    echo "Installing $$i"; \
   220    216   	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
   221    217   	    done;
   222    218   
   223    219   install-demos:
   224         -	@for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
          220  +	@for i in $(DESTDIR)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
   225    221   		$(SCRIPT_INSTALL_DIR)/demos; \
   226    222   	    do \
   227    223   	    if [ ! -d $$i ] ; then \
   228    224   		echo "Making directory $$i"; \
   229         -		mkdir $$i; \
          225  +		mkdir -p $$i; \
   230    226   		chmod 755 $$i; \
   231    227   		else true; \
   232    228   		fi; \
   233    229   	    done;
   234    230   	@cd $(SRC_DIR)/library/demos; for i in *; \
   235    231   	    do \
   236    232   	    if [ -f $$i ] ; then \
................................................................................
   245    241   	    done;
   246    242   
   247    243   install-man:
   248    244   	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR); \
   249    245   	    do \
   250    246   	    if [ ! -d $$i ] ; then \
   251    247   		echo "Making directory $$i"; \
   252         -		mkdir $$i; \
          248  +		mkdir -p $$i; \
   253    249   		chmod 755 $$i; \
   254    250   		else true; \
   255    251   		fi; \
   256    252   	    done;
   257    253   	@for i in *.1; \
   258    254   	    do \
   259    255   	    echo "Installing doc/$$i"; \