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
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
|
Description: Patch fixes installing directories and copying files under
INSTALL_ROOT. Also, it adds bltOldConfig.h to the installable headers
list and fixes it to include tk.h.
Author: Chris Waters and Sergei Golovan
Author: Steve Langasek <vorlon@debian.org>
Last-Modified: Mon, 31 Aug 2015 12:37:00 -0700
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,9 +47,9 @@
(cd library; $(MAKE) install)
(cd man; $(MAKE) install)
(cd demos; $(MAKE) install)
- $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
- $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
+ $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
+ $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
+ $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
mkdirs:
@for i in $(instdirs) ; do \
@@ -57,7 +57,7 @@
: ; \
else \
echo " mkdir $(INSTALL_ROOT)$$i" ; \
- mkdir $(INSTALL_ROOT)$$i ; \
+ mkdir -p $(INSTALL_ROOT)$$i ; \
fi ; \
done
@@ -66,10 +66,14 @@
(cd library; $(MAKE) clean)
(cd man; $(MAKE) clean)
(cd demos; $(MAKE) clean)
- $(RM) *.bak *\~ "#"* *pure* .pure*
+ $(RM) *.bak *\~ "#"* .pure*
GENERATED_FILES = \
config.status config.cache config.log Makefile
distclean: clean
+ (cd generic; $(MAKE) distclean)
+ (cd library; $(MAKE) distclean)
+ (cd man; $(MAKE) distclean)
+ (cd demos; $(MAKE) distclean)
$(RM) $(GENERATED_FILES)
--- a/generic/Makefile.in
+++ b/generic/Makefile.in
@@ -152,6 +152,7 @@
$(srcdir)/bltChain.h \
bltHash.h \
$(srcdir)/bltList.h \
+ $(srcdir)/bltOldConfig.h \
$(srcdir)/bltPool.h \
$(srcdir)/bltTree.h \
$(srcdir)/bltDecls.h \
@@ -230,7 +231,7 @@
: ; \
else \
echo " mkdir $(INSTALL_ROOT)$$i" ; \
- mkdir $(INSTALL_ROOT)$$i ; \
+ mkdir -p $(INSTALL_ROOT)$$i ; \
fi ; \
done
@@ -262,7 +263,8 @@
distclean: clean
$(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile
- $(RM) bltConfig.h Makefile TAGS
+ $(RM) bltConfig.h bltHash.h Makefile TAGS
+ (cd shared; $(MAKE) distclean)
.c.o:
$(CC) -c $(CC_SWITCHES) $<
--- a/generic/shared/Makefile.in
+++ b/generic/shared/Makefile.in
@@ -145,14 +145,20 @@
$(srcdir)/bltInit.c
$(RM) $@
$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \
- $(SHLIB_LIB_SPECS)
+ $(LIBS)
+
+# Line above changed for complete dependency listings - gordon
+# $(SHLIB_LIB_SPECS)
$(tcl_only_lib_so): $(TCL_ONLY_OBJS)
$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
$(srcdir)/bltInit.c
$(RM) $@
$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
- $(SHLIB_TCL_ONLY_LIB_SPECS)
+ $(TCL_ONLY_LIB_SPECS)
+
+# Line above changed for complete dependency listings - gordon
+# $(SHLIB_TCL_ONLY_LIB_SPECS)
install: mkdirs install-lib install-demo
@@ -175,10 +181,10 @@
done
clean:
$(RM) $(OBJS) $(lib_so) $(tcl_only_lib_so) $(bltwish) $(bltsh) \
- *pure* .pure*
+ *pure* .pure* bltInit.o
distclean: clean
- $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"*
+ $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile
# ------------------------------------------------------------------------
# in lieu of viewpath-ing...
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -79,7 +79,7 @@
: ; \
else \
echo " mkdir $(INSTALL_ROOT)$$i" ; \
- mkdir $(INSTALL_ROOT)"$$i" ; \
+ mkdir -p $(INSTALL_ROOT)"$$i" ; \
fi ; \
done
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -52,7 +52,7 @@
: ; \
else \
echo " mkdir $(INSTALL_ROOT)$$i" ; \
- mkdir $(INSTALL_ROOT)$$i ; \
+ mkdir -p $(INSTALL_ROOT)$$i ; \
fi ; \
done
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -61,7 +61,7 @@
for i in $(miscFiles) ; do \
$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
done
- $(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
+ $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
mkdirs:
@for i in $(instdirs) ; do \
@@ -69,7 +69,7 @@
: ; \
else \
echo " mkdir $(INSTALL_ROOT)$$i" ; \
- mkdir $(INSTALL_ROOT)$$i ; \
+ mkdir -p $(INSTALL_ROOT)$$i ; \
fi ; \
done
--- a/generic/bltOldConfig.h
+++ b/generic/bltOldConfig.h
@@ -1,5 +1,7 @@
/* Old config headers. */
+#include <tk.h>
+
EXTERN int Blt_ConfigureInfo _ANSI_ARGS_((Tcl_Interp * interp,
Tk_Window tkwin, Tk_ConfigSpec * specs,
char * widgRec, CONST char * argvName,
|
