|
1079
|
1 |
--- Makefile.in.old Fri May 2 20:10:28 2008
|
|
|
2 |
+++ Makefile.in Fri May 2 20:10:13 2008
|
|
|
3 |
@@ -15,7 +15,7 @@
|
|
|
4 |
default: files
|
|
|
5 |
|
|
|
6 |
files all install tf clean uninstall: _force_
|
|
|
7 |
- @cd src; PATH=${LONGPATH} ${MAKE} $@
|
|
|
8 |
+ @cd src; PATH=${LONGPATH} ${MAKE} IP=$(IP) $@
|
|
|
9 |
|
|
|
10 |
_force_:
|
|
|
11 |
|
|
|
12 |
--- unix/unix.mak.old Fri May 2 20:06:42 2008
|
|
|
13 |
+++ unix/unix.mak Fri May 2 20:11:21 2008
|
|
|
14 |
@@ -87,13 +87,13 @@
|
|
|
15 |
-test -z "$(STRIP)" || $(STRIP) tf$(X) || true
|
|
|
16 |
|
|
|
17 |
PREFIXDIRS:
|
|
|
18 |
- test -d "$(bindir)" || mkdir $(bindir)
|
|
|
19 |
- test -d "$(datadir)" || mkdir $(datadir)
|
|
|
20 |
+ test -d "$(IP)$(bindir)" || mkdir $(IP)$(bindir)
|
|
|
21 |
+ test -d "$(IP)$(datadir)" || mkdir $(IP)$(datadir)
|
|
|
22 |
|
|
|
23 |
install_TF $(TF): tf$(X) $(BUILDERS)
|
|
|
24 |
- -@rm -f $(TF)
|
|
|
25 |
- cp tf$(X) $(TF)
|
|
|
26 |
- chmod $(MODE) $(TF)
|
|
|
27 |
+ -@rm -f $(IP)$(TF)
|
|
|
28 |
+ cp tf$(X) $(IP)$(TF)
|
|
|
29 |
+ chmod $(MODE) $(IP)$(TF)
|
|
|
30 |
|
|
|
31 |
SYMLINK $(SYMLINK): $(TF)
|
|
|
32 |
test -z "$(SYMLINK)" || { rm -f $(SYMLINK) && ln -s $(TF) $(SYMLINK); }
|
|
|
33 |
@@ -101,32 +101,32 @@
|
|
|
34 |
LIBRARY $(TF_LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx
|
|
|
35 |
@echo '## Creating library directory...'
|
|
|
36 |
# @# Overly simplified shell commands, to avoid problems on ultrix
|
|
|
37 |
- -@test -n "$(TF_LIBDIR)" || echo "TF_LIBDIR is undefined."
|
|
|
38 |
- test -n "$(TF_LIBDIR)"
|
|
|
39 |
- test -d "$(TF_LIBDIR)" || mkdir $(TF_LIBDIR)
|
|
|
40 |
- -@test -d "$(TF_LIBDIR)" || echo "Can't make $(TF_LIBDIR) directory. See if"
|
|
|
41 |
- -@test -d "$(TF_LIBDIR)" || echo "there is already a file with that name."
|
|
|
42 |
- test -d "$(TF_LIBDIR)"
|
|
|
43 |
+ -@test -n "$(IP)$(TF_LIBDIR)" || echo "TF_LIBDIR is undefined."
|
|
|
44 |
+ test -n "$(IP)$(TF_LIBDIR)"
|
|
|
45 |
+ test -d "$(IP)$(TF_LIBDIR)" || mkdir $(IP)$(TF_LIBDIR)
|
|
|
46 |
+ -@test -d "$(IP)$(TF_LIBDIR)" || echo "Can't make $(TF_LIBDIR) directory. See if"
|
|
|
47 |
+ -@test -d "$(IP)$(TF_LIBDIR)" || echo "there is already a file with that name."
|
|
|
48 |
+ test -d "$(IP)$(TF_LIBDIR)"
|
|
|
49 |
#
|
|
|
50 |
# @#rm -f $(TF_LIBDIR)/*; # wrong: this would remove local.tf, etc.
|
|
|
51 |
@echo '## Copying library files...'
|
|
|
52 |
cd ../tf-lib; \
|
|
|
53 |
for f in *; do test -f $$f && files="$$files $$f"; done; \
|
|
|
54 |
- ( cd $(TF_LIBDIR); rm -f $$files tf.help tf.help.index; ); \
|
|
|
55 |
- cp $$files $(TF_LIBDIR); \
|
|
|
56 |
- cd $(TF_LIBDIR); \
|
|
|
57 |
+ ( cd $(IP)$(TF_LIBDIR); rm -f $$files tf.help tf.help.index; ); \
|
|
|
58 |
+ cp $$files $(IP)$(TF_LIBDIR); \
|
|
|
59 |
+ cd $(IP)$(TF_LIBDIR); \
|
|
|
60 |
chmod $(MODE) $$files; chmod ugo-wx $$files
|
|
|
61 |
- -rm -f $(TF_LIBDIR)/CHANGES
|
|
|
62 |
- cp ../CHANGES $(TF_LIBDIR)
|
|
|
63 |
- chmod $(MODE) $(TF_LIBDIR)/CHANGES; chmod ugo-wx $(TF_LIBDIR)/CHANGES
|
|
|
64 |
- chmod $(MODE) $(TF_LIBDIR)
|
|
|
65 |
- -@cd $(TF_LIBDIR); old=`ls replace.tf 2>/dev/null`; \
|
|
|
66 |
+ -rm -f $(IP)$(TF_LIBDIR)/CHANGES
|
|
|
67 |
+ cp ../CHANGES $(IP)$(TF_LIBDIR)
|
|
|
68 |
+ chmod $(MODE) $(IP)$(TF_LIBDIR)/CHANGES; chmod ugo-wx $(IP)$(TF_LIBDIR)/CHANGES
|
|
|
69 |
+ chmod $(MODE) $(IP)$(TF_LIBDIR)
|
|
|
70 |
+ -@cd $(IP)$(TF_LIBDIR); old=`ls replace.tf 2>/dev/null`; \
|
|
|
71 |
if [ -n "$$old" ]; then \
|
|
|
72 |
- echo "## WARNING: Obsolete files found in $(TF_LIBDIR): $$old"; \
|
|
|
73 |
+ echo "## WARNING: Obsolete files found in $(IP)$(TF_LIBDIR): $$old"; \
|
|
|
74 |
fi
|
|
|
75 |
@echo '## Creating links so old library names still work...'
|
|
|
76 |
# @# note: ln -sf isn't portable.
|
|
|
77 |
- @cd $(TF_LIBDIR); \
|
|
|
78 |
+ @cd $(IP)$(TF_LIBDIR); \
|
|
|
79 |
rm -f bind-bash.tf; ln -s kb-bash.tf bind-bash.tf; \
|
|
|
80 |
rm -f bind-emacs.tf; ln -s kb-emacs.tf bind-emacs.tf; \
|
|
|
81 |
rm -f completion.tf; ln -s complete.tf completion.tf; \
|