]>
Commit | Line | Data |
---|---|---|
4a1c5fe8 JK |
1 | diff -durN crossfire-0.98.0.orig/Makefile.in crossfire-0.98.0/Makefile.in |
2 | --- crossfire-0.98.0.orig/Makefile.in Sun Apr 8 07:49:34 2001 | |
3 | +++ crossfire-0.98.0/Makefile.in Tue Apr 17 09:34:56 2001 | |
1523eafe JK |
4 | @@ -124,7 +124,7 @@ |
5 | ||
6 | install:: | |
7 | @if [ ! -d ${prefix} ]; then \ | |
8 | - $(MKDIR) -p ${prefix}; \ | |
9 | + $(MKDIR) -p $(DESTDIR)${prefix}; \ | |
10 | fi | |
11 | @for dir in $(SUBDIRS); \ | |
12 | do \ | |
4a1c5fe8 JK |
13 | diff -durN crossfire-0.98.0.orig/crossedit/Makefile.in crossfire-0.98.0/crossedit/Makefile.in |
14 | --- crossfire-0.98.0.orig/crossedit/Makefile.in Sun Apr 8 07:49:35 2001 | |
15 | +++ crossfire-0.98.0/crossedit/Makefile.in Tue Apr 17 09:34:56 2001 | |
1523eafe JK |
16 | @@ -151,7 +151,7 @@ |
17 | ||
18 | ||
19 | install:: crossedit | |
20 | - @if [ ! -d ${bindir} ]; then \ | |
21 | - $(MKDIR) -p ${bindir}; \ | |
22 | + @if [ ! -d $(DESTDIR)${bindir} ]; then \ | |
23 | + $(MKDIR) -p $(DESTDIR)${bindir}; \ | |
24 | fi | |
25 | - $(INSTALL) crossedit ${bindir}/crossedit | |
26 | + $(INSTALL) crossedit $(DESTDIR)${bindir}/crossedit | |
4a1c5fe8 JK |
27 | diff -durN crossfire-0.98.0.orig/doc/Makefile.in crossfire-0.98.0/doc/Makefile.in |
28 | --- crossfire-0.98.0.orig/doc/Makefile.in Sun Apr 8 07:49:34 2001 | |
29 | +++ crossfire-0.98.0/doc/Makefile.in Tue Apr 17 09:34:56 2001 | |
1523eafe JK |
30 | @@ -76,8 +76,8 @@ |
31 | $(RM) -rf $(DTOP) | |
32 | ||
33 | install:: | |
34 | - @if [ ! -d $(MAN1) ]; then \ | |
35 | - $(MKDIR) -p $(MAN1); \ | |
36 | + @if [ ! -d $(DESTDIR)$(MAN1) ]; then \ | |
37 | + $(MKDIR) -p $(DESTDIR)$(MAN1); \ | |
38 | fi | |
39 | - $(INSTALL) $(srcdir)/crossedit.man $(MAN1)/crossedit.$(MANSUFFIX) | |
40 | - $(INSTALL) $(srcdir)/crossfire.man $(MAN1)/crossfire.$(MANSUFFIX) | |
41 | + $(INSTALL) $(srcdir)/crossedit.man $(DESTDIR)$(MAN1)/crossedit.$(MANSUFFIX) | |
42 | + $(INSTALL) $(srcdir)/crossfire.man $(DESTDIR)$(MAN1)/crossfire.$(MANSUFFIX) | |
4a1c5fe8 JK |
43 | diff -durN crossfire-0.98.0.orig/lib/Makefile.in crossfire-0.98.0/lib/Makefile.in |
44 | --- crossfire-0.98.0.orig/lib/Makefile.in Sun Apr 8 07:49:34 2001 | |
45 | +++ crossfire-0.98.0/lib/Makefile.in Tue Apr 17 09:41:10 2001 | |
46 | @@ -110,43 +110,43 @@ | |
1523eafe JK |
47 | make collect |
48 | ||
4a1c5fe8 | 49 | install:: archetypes bmaps.paths crossfire.xbm crossfire.xpm crossfire.png animations collect.pl xpmtopix.pl util.pl |
1523eafe JK |
50 | - @if [ ! -d $(datadir) ]; then \ |
51 | - $(MKDIR) -p $(datadir); \ | |
52 | + @if [ ! -d $(DESTDIR)$(datadir) ]; then \ | |
53 | + $(MKDIR) -p $(DESTDIR)$(datadir); \ | |
54 | fi | |
55 | - @if [ ! -d $(localdir) ]; then \ | |
56 | - $(MKDIR) -p $(localdir); \ | |
57 | + @if [ ! -d $(DESTDIR)$(localdir) ]; then \ | |
58 | + $(MKDIR) -p $(DESTDIR)$(localdir); \ | |
59 | fi | |
60 | ||
61 | - if [ ! -d $(datadir)/help ]; then \ | |
4a1c5fe8 | 62 | - echo "Creating directory $(datadir)/help"; \ |
1523eafe | 63 | - $(MKDIR) -p $(datadir)/help; \ |
4a1c5fe8 JK |
64 | + if [ ! -d $(DESTDIR)$(datadir)/help ]; then \ |
65 | + echo "Creating directory $(DESTDIR)$(datadir)/help"; \ | |
1523eafe JK |
66 | + $(MKDIR) -p $(DESTDIR)$(datadir)/help; \ |
67 | fi; | |
68 | @for i in $(FILES_HELP); do \ | |
69 | echo "Installing $$i"; \ | |
70 | - $(INSTALL) $(INSTALLFLAGS) $$i $(datadir)/help; \ | |
71 | + $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir)/help; \ | |
72 | done | |
73 | @for i in $(INSTALLFILES); do \ | |
74 | echo "Installing $$i"; \ | |
75 | - $(INSTALL) $(INSTALLFLAGS) $$i $(datadir); \ | |
76 | + $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir); \ | |
77 | done | |
78 | ||
4a1c5fe8 JK |
79 | @for i in $(BININSTALL); do \ |
80 | echo "Installing $$i"; \ | |
81 | - $(INSTALL) $(INSTALLFLAGS) $$i $(bindir); \ | |
82 | + $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(bindir); \ | |
83 | done | |
84 | ||
85 | - @if [ ! -f $(datadir)/settings ]; then \ | |
1523eafe | 86 | - $(INSTALL) $(INSTALLFLAGS) settings $(datadir); \ |
4a1c5fe8 | 87 | + @if [ ! -f $(DESTDIR)$(datadir)/settings ]; then \ |
1523eafe JK |
88 | + $(INSTALL) $(INSTALLFLAGS) settings $(DESTDIR)$(datadir); \ |
89 | fi | |
90 | ||
91 | - touch $(localdir)/highscore | |
92 | - touch $(localdir)/bookarch | |
93 | - touch $(localdir)/temp.maps | |
94 | + touch $(DESTDIR)$(localdir)/highscore | |
95 | + touch $(DESTDIR)$(localdir)/bookarch | |
96 | + touch $(DESTDIR)$(localdir)/temp.maps | |
97 | ||
98 | @for i in players unique-items; do \ | |
4a1c5fe8 JK |
99 | - if [ ! -d $(localdir)/$$i ]; then \ |
100 | - echo "Creating directory $(localdir)/$$i"; \ | |
1523eafe | 101 | - $(MKDIR) -p $(localdir)/$$i; \ |
4a1c5fe8 JK |
102 | + if [ ! -d $(DESTDIR)$(localdir)/$$i ]; then \ |
103 | + echo "Creating directory $(DESTDIR)$(localdir)/$$i"; \ | |
1523eafe JK |
104 | + $(MKDIR) -p $(DESTDIR)$(localdir)/$$i; \ |
105 | fi; \ | |
106 | done | |
107 | ||
4a1c5fe8 JK |
108 | diff -durN crossfire-0.98.0.orig/random_maps/Makefile.in crossfire-0.98.0/random_maps/Makefile.in |
109 | --- crossfire-0.98.0.orig/random_maps/Makefile.in Sun Apr 8 07:49:34 2001 | |
110 | +++ crossfire-0.98.0/random_maps/Makefile.in Tue Apr 17 09:34:56 2001 | |
111 | @@ -122,10 +122,10 @@ | |
1523eafe JK |
112 | @echo $(SRCS) > .patchlist |
113 | ||
114 | install:: random_map | |
115 | - @if [ ! -d ${bindir} ]; then \ | |
116 | - $(MKDIR) -p ${bindir}; \ | |
117 | + @if [ ! -d $(DESTDIR)${bindir} ]; then \ | |
118 | + $(MKDIR) -p $(DESTDIR)${bindir}; \ | |
119 | fi | |
120 | - $(INSTALL) random_map ${bindir}/random_map | |
121 | + $(INSTALL) random_map $(DESTDIR)${bindir}/random_map | |
122 | ||
123 | ||
124 | ||
4a1c5fe8 JK |
125 | diff -durN crossfire-0.98.0.orig/server/Makefile.in crossfire-0.98.0/server/Makefile.in |
126 | --- crossfire-0.98.0.orig/server/Makefile.in Sun Apr 8 07:49:34 2001 | |
127 | +++ crossfire-0.98.0/server/Makefile.in Tue Apr 17 09:34:56 2001 | |
128 | @@ -139,7 +139,7 @@ | |
1523eafe JK |
129 | @echo $(SRCS) > .patchlist |
130 | ||
131 | install:: crossfire | |
132 | - @if [ ! -d ${bindir} ]; then \ | |
133 | - $(MKDIR) -p ${bindir}; \ | |
134 | + @if [ ! -d $(DESTDIR)${bindir} ]; then \ | |
135 | + $(MKDIR) -p $(DESTDIR)${bindir}; \ | |
136 | fi | |
137 | - $(INSTALL) crossfire ${bindir}/crossfire | |
138 | + $(INSTALL) crossfire $(DESTDIR)${bindir}/crossfire | |
4a1c5fe8 JK |
139 | diff -durN crossfire-0.98.0.orig/utils/Makefile.in crossfire-0.98.0/utils/Makefile.in |
140 | --- crossfire-0.98.0.orig/utils/Makefile.in Sun Apr 8 07:49:34 2001 | |
141 | +++ crossfire-0.98.0/utils/Makefile.in Tue Apr 17 09:34:56 2001 | |
142 | @@ -20,20 +20,20 @@ | |
1523eafe JK |
143 | $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) |
144 | ||
145 | install: | |
146 | - @if [ ! -d $(bindir) ]; then \ | |
147 | - $(MKDIR) -p $(bindir); \ | |
148 | + @if [ ! -d $(DESTDIR)$(bindir) ]; then \ | |
149 | + $(MKDIR) -p $(DESTDIR)$(bindir); \ | |
150 | fi | |
151 | - rm -f $(bindir)/flushlocks | |
152 | - sed s%xxxx%$(libdir)%g <flushlocks > $(bindir)/flushlocks | |
153 | - chmod 755 $(bindir)/flushlocks | |
154 | - rm -f $(bindir)/crossloop.pl | |
155 | - sed s%BINDIR%$(bindir)%g <crossloop.pl >$(bindir)/crossloop.pl | |
156 | - chmod 755 $(bindir)/crossloop.pl | |
157 | - rm -f $(C_BINDIR)/crossloop | |
158 | - sed s%BINDIR%$(bindir)%g <crossloop >$(bindir)/crossloop | |
159 | - chmod 755 $(bindir)/crossloop | |
160 | - $(INSTALL) $(INSTALLFLAGS) mktable.script $(bindir)/mktable | |
161 | - $(INSTALL) $(INSTALLFLAGS) add_throw.perl $(bindir)/add_throw | |
162 | + rm -f $(DESTDIR)$(bindir)/flushlocks | |
163 | + sed s%xxxx%$(libdir)%g <flushlocks > $(DESTDIR)$(bindir)/flushlocks | |
164 | + chmod 755 $(DESTDIR)$(bindir)/flushlocks | |
165 | + rm -f $(DESTDIR)$(bindir)/crossloop.pl | |
166 | + sed s%BINDIR%$(bindir)%g <crossloop.pl >$(DESTDIR)$(bindir)/crossloop.pl | |
167 | + chmod 755 $(DESTDIR)$(bindir)/crossloop.pl | |
168 | + rm -f $(DESTDIR)$(C_BINDIR)/crossloop | |
169 | + sed s%BINDIR%$(bindir)%g <crossloop >$(DESTDIR)$(bindir)/crossloop | |
170 | + chmod 755 $(DESTDIR)$(bindir)/crossloop | |
171 | + $(INSTALL) $(INSTALLFLAGS) mktable.script $(DESTDIR)$(bindir)/mktable | |
172 | + $(INSTALL) $(INSTALLFLAGS) add_throw.perl $(DESTDIR)$(bindir)/add_throw | |
173 | ||
174 | depend:: | |
175 |