summaryrefslogtreecommitdiff
blob: 727f7e8b5356dbcede26e9e6bcfbb8c265bd3e0d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
 Makefile.in |   40 ++++++++++++++++------------------------
 1 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 00960d9..16d4123 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,9 +29,9 @@ exec_prefix =		@exec_prefix@
 # The following definition can be set to non-null for special systems
 # like AFS with replication.  It allows the pathnames used for installation
 # to be different than those used for actually reference files at
-# run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
+# run-time.  DESTDIR is prepended to $prefix and $exec_prefix
 # when installing files.
-INSTALL_ROOT =
+DESTDIR =
 
 # Directory from which applications will reference the library of Tcl
 # scripts (note: you can set the CK_LIBRARY environment variable at
@@ -39,22 +39,22 @@ INSTALL_ROOT =
 CK_LIBRARY =		$(prefix)/lib/ck$(VERSION)
 
 # Path name to use when installing library scripts:
-SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(CK_LIBRARY)
+SCRIPT_INSTALL_DIR =	$(DESTDIR)$(CK_LIBRARY)
 
 # Directory in which to install the archive libck*:
-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/lib
 
 # Directory in which to install the program cwsh:
-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/bin
 
 # Directory from which the program cwsh should be referenced by scripts:
 BIN_DIR =		$(exec_prefix)/bin
 
 # Directory in which to install the include file ck.h:
-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR =	$(DESTDIR)$(prefix)/include
 
 # Top-level directory for manual entries:
-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR = $(DESTDIR)$(prefix)/share/man
 
 # Directory in which to install manual entry for cwsh:
 MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
@@ -96,7 +96,7 @@ LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(CURSES_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
 
 # To change the compiler switches, for example to change from -O
 # to -g, change the following line:
-CFLAGS = -O
+#CFLAGS = -O
 
 # To disable ANSI-C procedure prototypes reverse the comment characters
 # on the following lines:
@@ -231,14 +231,14 @@ configInfo: Makefile
 	@echo "CK_CURSES_INCLUDES = ${CURSES_INCLUDES}" >> configInfo
 	@echo "CK_LIBS = ${CURSES_LIB_SWITCHES} @LIBS@" >> configInfo
 
-install: install-binaries install-libraries
+install: install-man install-binaries install-libraries
 
 install-binaries: $(CK_LIB_FILE) cwsh
 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
-		mkdir $$i; \
+		mkdir -p $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
@@ -251,12 +251,12 @@ install-binaries: $(CK_LIB_FILE) cwsh
 	@$(INSTALL_PROGRAM) cwsh $(BIN_INSTALL_DIR)/cwsh
 
 install-libraries:
-	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
+	@for i in $(DESTDIR)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
 		$(SCRIPT_INSTALL_DIR) ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
-		mkdir $$i; \
+		mkdir -p $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
@@ -270,13 +270,13 @@ install-libraries:
 	    done;
 
 install-demos:
-	@for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
+	@for i in $(DESTDIR)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
 		$(SCRIPT_INSTALL_DIR)/demos \
 		$(SCRIPT_INSTALL_DIR)/demos/images ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
-		mkdir $$i; \
+		mkdir -p $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
@@ -301,11 +301,11 @@ install-demos:
 	    done;
 
 install-man:
-	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
+	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR); \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
-		mkdir $$i; \
+		mkdir -p $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
@@ -326,14 +326,6 @@ install-man:
 		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
 	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
 	    done;
-	@cd $(SRC_DIR)/doc; for i in *.n; \
-	    do \
-	    echo "Installing doc/$$i"; \
-	    rm -f $(MANN_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MANN_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
-	    done;
 
 Makefile: $(SRC_DIR)/Makefile.in
 	$(SHELL) config.status