]> git.pld-linux.org Git - packages/alex.git/blame - alex-DESTDIR.patch
- fix ppc too; release 3
[packages/alex.git] / alex-DESTDIR.patch
CommitLineData
f18a41b3
JR
1--- alex-2.0/mk/target.mk.orig Wed Jul 23 17:25:32 2003
2+++ alex-2.0/mk/target.mk Tue Feb 17 15:49:03 2004
3@@ -606,9 +606,9 @@
4 #
5 $(LINK) : $(LINK_TARGET)
6 @if ( $(PERL) -e '$$fn="$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
7- echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK)"; \
8- $(RM) $(LINK); \
9- $(LN_S) $(LINK_TARGET) $(LINK); \
10+ echo "Creating a symbolic link from $(LINK_TARGET) to $(DESTDIR)$(LINK)"; \
11+ $(RM) $(DESTDIR)$(LINK); \
12+ $(LN_S) $(LINK_TARGET) $(DESTDIR)$(LINK); \
13 else \
14 echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) failed: \`$(LINK)' already exists"; \
15 echo "Perhaps remove \`$(LINK)' manually?"; \
16@@ -622,12 +622,12 @@
17 install ::
18 @$(INSTALL_DIR) $(bindir)
19 @if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
20- echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) in $(bindir)"; \
21- $(RM) $(bindir)/$(LINK); \
22- $(LN_S) $(LINK_TARGET) $(bindir)/$(LINK); \
23+ echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) in $(DESTDIR)$(bindir)"; \
24+ $(RM) $(DESTDIR)$(bindir)/$(LINK); \
25+ $(LN_S) $(LINK_TARGET) $(DESTDIR)$(bindir)/$(LINK); \
26 else \
27- echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \
28- echo "Perhaps remove \`$(bindir)/$(LINK)' manually?"; \
29+ echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) in $(DESTDIR)$(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \
30+ echo "Perhaps remove \`$(DESTDIR)$(bindir)/$(LINK)' manually?"; \
31 exit 1; \
32 fi;
33
34@@ -695,10 +695,10 @@
35 INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS), $(addsuffix $(if $(suffix $(p)),,$(exeext)), $(basename $(p))))
36
37 install:: $(INSTALL_PROGS)
38- @$(INSTALL_DIR) $(bindir)
39+ @$(INSTALL_DIR) $(DESTDIR)$(bindir)
40 @for i in $(INSTALL_PROGS); do \
41- echo $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir); \
42- $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir) ; \
43+ echo $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(bindir); \
44+ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(bindir) ; \
45 done
46 endif
47
48@@ -708,42 +708,42 @@
49 #
50 ifneq "$(INSTALL_SCRIPTS)" ""
51 install:: $(INSTALL_SCRIPTS)
52- @$(INSTALL_DIR) $(bindir)
53+ @$(INSTALL_DIR) $(DESTDIR)$(bindir)
54 for i in $(INSTALL_SCRIPTS); do \
55- $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(bindir); \
56+ $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(bindir); \
57 done
58 endif
59
60 ifneq "$(INSTALL_LIB_SCRIPTS)" ""
61 install:: $(INSTALL_LIB_SCRIPTS)
62- @$(INSTALL_DIR) $(libdir)
63+ @$(INSTALL_DIR) $(DESTDIR)$(libdir)
64 for i in $(INSTALL_LIB_SCRIPTS); do \
65- $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir); \
66+ $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \
67 done
68 endif
69
70 ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
71 install:: $(INSTALL_LIBEXEC_SCRIPTS)
72- @$(INSTALL_DIR) $(libexecdir)
73+ @$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
74 for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
75- $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir); \
76+ $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \
77 done
78 endif
79
80 ifneq "$(INSTALL_LIBS)" ""
81 install:: $(INSTALL_LIBS)
82- @$(INSTALL_DIR) $(libdir)
83+ @$(INSTALL_DIR) $(DESTDIR)$(libdir)
84 for i in $(INSTALL_LIBS); do \
85 case $$i in \
86 *.a) \
87- $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
88- $(RANLIB) $(libdir)/`basename $$i` ;; \
89+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \
90+ $(RANLIB) $(DESTDIR)$(libdir)/`basename $$i` ;; \
91 *.dll) \
92- $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(libdir) ;; \
93+ $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \
94 *.so) \
95- $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(libdir) ;; \
96+ $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \
97 *) \
98- $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
99+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \
100 esac; \
101 done
102 endif
103@@ -756,64 +756,64 @@
104 INSTALL_LIBEXECS := $(foreach p, $(INSTALL_LIBEXECS), $(addsuffix $(subst _,,$(subst __,$(exeext),_$(suffix $(p))_)), $(basename $(p))))
105
106 install:: $(INSTALL_LIBEXECS)
107- @$(INSTALL_DIR) $(libexecdir)
108+ @$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
109 -for i in $(INSTALL_LIBEXECS); do \
110- $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(libexecdir); \
111+ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \
112 done
113 endif
114
115 ifneq "$(INSTALL_DATAS)" ""
116 install:: $(INSTALL_DATAS)
117- @$(INSTALL_DIR) $(datadir)
118+ @$(INSTALL_DIR) $(DESTDIR)$(datadir)
119 for i in $(INSTALL_DATAS); do \
120- $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \
121+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(datadir); \
122 done
123 endif
124
125 ifneq "$(INSTALL_IFACES)" ""
126 install:: $(INSTALL_IFACES)
127- @$(INSTALL_DIR) $(ifacedir)
128+ @$(INSTALL_DIR) $(DESTDIR)$(ifacedir)
129 for i in $(INSTALL_IFACES); do \
130- $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(ifacedir); \
131+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ifacedir); \
132 done
133 endif
134
135 ifneq "$(INSTALL_IFACES_WITH_DIRS)" ""
136 install:: $(INSTALL_IFACES_WITH_DIRS)
137- @$(INSTALL_DIR) $(ifacedir)
138+ @$(INSTALL_DIR) $(DESTDIR)$(ifacedir)
139 for i in $(INSTALL_IFACES_WITH_DIRS); do \
140- $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(ifacedir)/`dirname $$i`; \
141+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ifacedir)/`dirname $$i`; \
142 done
143 endif
144
145 ifneq "$(INSTALL_INCLUDES)" ""
146 install:: $(INSTALL_INCLUDES)
147- @$(INSTALL_DIR) $(includedir)
148+ @$(INSTALL_DIR) $(DESTDIR)$(includedir)
149 for i in $(INSTALL_INCLUDES); do \
150- $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(includedir); \
151+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir); \
152 done
153 endif
154
155 ifneq "$(INSTALL_DOCS)" ""
156 install-docs:: $(INSTALL_DOCS)
157- @$(INSTALL_DIR) $(datadir)
158+ @$(INSTALL_DIR) $(DESTDIR)$(datadir)
159 for i in $(INSTALL_DOCS); do \
160- $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \
161+ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(datadir); \
162 done
163 endif
164
165 ifneq "$(INSTALL_SGML_DOC)" ""
166 ifneq "$(SGMLDocWays)" ""
167 install-docs:: $(foreach i,$(SGMLDocWays),$(INSTALL_SGML_DOC).$i)
168- @$(INSTALL_DIR) $(datadir)
169+ @$(INSTALL_DIR) $(DESTDIR)$(datadir)
170 @for i in $(SGMLDocWays); do \
171 if [ $$i = "html" ]; then \
172- $(INSTALL_DIR) $(datadir)/html; \
173- echo $(CP) -r $(INSTALL_SGML_DOC) $(datadir)/html; \
174- $(CP) -r $(INSTALL_SGML_DOC) $(datadir)/html; \
175+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/html; \
176+ echo $(CP) -r $(INSTALL_SGML_DOC) $(DESTDIR)$(datadir)/html; \
177+ $(CP) -r $(INSTALL_SGML_DOC) $(DESTDIR)$(datadir)/html; \
178 else \
179- echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \
180- $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \
181+ echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(DESTDIR)$(datadir); \
182+ $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(DESTDIR)$(datadir); \
183 fi \
184 done
185 endif
This page took 0.055201 seconds and 4 git commands to generate.