1 diff -ru xemacs-21.5.21.orig/Makefile.in.in xemacs-21.5.21/Makefile.in.in
2 --- xemacs-21.5.21.orig/Makefile.in.in 2005-04-09 01:10:02.000000000 +0200
3 +++ xemacs-21.5.21/Makefile.in.in 2005-06-02 12:56:39.000000000 +0200
5 RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
14 (cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \
15 exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
16 archlibdir=${archlibdir}) ; done
17 - if test "`(cd ${archlibdir} && $(pwd))`" != \
18 + if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" != \
19 "`(cd ./lib-src && $(pwd))`"; then \
20 if test -f ../Installation; then \
21 - ${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \
22 + ${INSTALL_DATA} ../Installation $(DESTDIR)${archlibdir}/Installation; \
24 - ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \
25 - ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \
26 + ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \
27 + ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \
28 for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
29 do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
31 #if (defined(PDUMP) && !defined (DUMP_IN_EXEC)) || (defined (PDUMP) && defined(WIN32_NATIVE))
32 - ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
33 + ${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
36 - ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
37 - -chmod 0755 ${bindir}/${PROGNAME}
38 + ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}
39 + -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}
42 - ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe
43 - -chmod 0755 ${bindir}/${PROGNAME}-${version}.exe
44 - cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
45 + ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
46 + -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
47 + cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
49 - ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
50 - -chmod 0755 ${bindir}/${PROGNAME}-${version}
51 - cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
52 + ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}
53 + -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}
54 + cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
56 #endif /* WIN32_NATIVE */
57 if test "${prefix}" != "${exec_prefix}"; then \
58 - $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
59 + $(MAKEPATH) $(DESTDIR)${exec_prefix}/lib/${instvardir}; \
61 lib/${inststaticdir} \
62 lib/${instvardir}/etc \
67 - $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir)
68 + $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir)
71 install-arch-indep: mkdir info
72 -@set ${COPYDESTS} ; \
73 for dir in ${COPYDIR} ; do \
74 - if test "`(cd $$1 && $(pwd))`" != \
75 + if test "`(cd $(DESTDIR)$$1 && $(pwd))`" != \
76 "`(cd $${dir} && $(pwd))`"; then \
77 : do nothing - echo "rm -rf $$1" ; \
82 for dir in ${COPYDESTS} ; do \
83 - if test ! -d $${dir} ; then mkdir $${dir} ; fi ; \
84 + if test ! -d $${dir} ; then mkdir $(DESTDIR)$${dir} ; fi ; \
86 for dir in ${COPYDIR} ; do \
89 -a "`(cd $${dir} && $(pwd))`" != \
90 - "`(cd $${dest} && $(pwd))`" \
91 + "`(cd $(DESTDIR)$${dest} && $(pwd))`" \
92 && (echo "Copying $${dir}..." ; \
93 (cd $${dir} && $(TAR) -cf - . ) | \
94 - (cd $${dest} && umask 022 && $(TAR) -xf - );\
95 - chmod 0755 $${dest}; \
96 - for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
97 + (cd $(DESTDIR)$${dest} && umask 022 && $(TAR) -xf - );\
98 + chmod 0755 $(DESTDIR)$${dest}; \
99 + for subdir in `find $(DESTDIR)$${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
100 (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \
103 if test "`(cd ${srcdir}/info && $(pwd))`" != \
104 - "`(cd ${infodir} && $(pwd))`" && cd ${srcdir}/info; then \
105 - if test ! -f ${infodir}/dir -a -f dir ; then \
106 - ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \
107 + "`(cd $(DESTDIR)${infodir} && $(pwd))`" && cd ${srcdir}/info; then \
108 + if test ! -f $(DESTDIR)${infodir}/dir -a -f dir ; then \
109 + ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \
111 for file in *.info* ; do \
112 - ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \
113 - chmod 0644 ${infodir}/$${file}; \
114 + ${INSTALL_DATA} $${file} $(DESTDIR)${infodir}/$${file} ; \
115 + chmod 0644 $(DESTDIR)${infodir}/$${file}; \
118 cd ${srcdir}/etc && \
119 for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
120 - ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
121 - chmod 0644 ${mandir}/$${page}${manext} ; \
122 + ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \
123 + chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \
125 @echo "If you would like to save approximately 4M of disk space, do"
127 @@ -469,19 +471,23 @@
131 - $(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir}
132 + $(SHELL) ${srcdir}/lib-src/gzip-el.sh $(DESTDIR)${lispdir}
134 ## Build all the directories to install XEmacs in.
135 ## Since we may be creating several layers of directories,
136 ## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use
137 ## make-path instead of mkdir. Not all mkdirs have the `-p' flag.
139 - ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \
140 - ${mandir} ${bindir} ${datadir} ${libdir} \
142 + ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \
143 + ${mandir} ${bindir} ${datadir} ${libdir} \
145 - ${moduledir} ${sitemoduledir} \
146 + ${moduledir} ${sitemoduledir} \
151 + ${MAKEPATH} $(DESTDIR)$${dir} ; \
154 ## Delete all the installed files that the `install' target would
155 ## create (but not the noninstalled files such as `make all' would
156 diff -ru xemacs-21.5.21.orig/dynodump/Makefile.in.in xemacs-21.5.21/dynodump/Makefile.in.in
157 --- xemacs-21.5.21.orig/dynodump/Makefile.in.in 2001-04-12 20:20:43.000000000 +0200
158 +++ xemacs-21.5.21/dynodump/Makefile.in.in 2005-06-02 12:51:26.000000000 +0200
161 ## Synched up with: Not synched with FSF.
165 ## For performance and consistency, no built-in rules.
167 .SUFFIXES: .c .o .i .h
168 diff -ru xemacs-21.5.21.orig/etc/tests/external-widget/Makefile xemacs-21.5.21/etc/tests/external-widget/Makefile
169 --- xemacs-21.5.21.orig/etc/tests/external-widget/Makefile 1996-12-18 23:42:31.000000000 +0100
170 +++ xemacs-21.5.21/etc/tests/external-widget/Makefile 2005-06-02 12:51:26.000000000 +0200
174 CFLAGS += -Xc -g -DTOOLTALK
176 EMACSLIBDIR = $(EMACSHOME)/editor/src
177 diff -ru xemacs-21.5.21.orig/lib-src/Makefile.in.in xemacs-21.5.21/lib-src/Makefile.in.in
178 --- xemacs-21.5.21.orig/lib-src/Makefile.in.in 2005-04-09 01:10:36.000000000 +0200
179 +++ xemacs-21.5.21/lib-src/Makefile.in.in 2005-06-02 12:51:26.000000000 +0200
181 ## above a certain point in this file are in shell format instead of
182 ## in C format. How the hell is this supposed to work? */
186 ## For performance and consistency, no built-in rules
189 @@ -243,26 +245,26 @@
190 ## just run them directly from lib-src.
192 @echo; echo "Installing utilities run internally by XEmacs."
193 - ./make-path ${archlibdir}
194 + ./make-path $(DESTDIR)${archlibdir}
195 if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
196 for f in ${PRIVATE_INSTALLABLE_EXES}; do \
197 - (cd .. && $(INSTALL_PROGRAM) lib-src/$$f ${archlibdir}/$$f) ; \
198 + (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \
201 if test "`(cd ${archlibdir} && $(pwd))`" \
202 != "`(cd ${srcdir} && $(pwd))`"; then \
203 for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \
204 - (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \
205 + (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \
209 install: ${archlibdir}
210 @echo; echo "Installing utilities for users to run."
211 for file in ${PUBLIC_INSTALLABLE_EXES} ; do \
212 - (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
213 + (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/$${file}) ; \
215 for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \
216 - (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
217 + (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \
221 diff -ru xemacs-21.5.21.orig/lwlib/Makefile.in.in xemacs-21.5.21/lwlib/Makefile.in.in
222 --- xemacs-21.5.21.orig/lwlib/Makefile.in.in 2004-09-20 21:19:16.000000000 +0200
223 +++ xemacs-21.5.21/lwlib/Makefile.in.in 2005-06-02 12:51:26.000000000 +0200
225 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
226 ## Boston, MA 02111-1307, USA.
230 ## For performance and consistency, no built-in rules
232 .SUFFIXES: .c .h .o .i .s
233 diff -ru xemacs-21.5.21.orig/man/Makefile xemacs-21.5.21/man/Makefile
234 --- xemacs-21.5.21.orig/man/Makefile 2005-01-31 21:08:47.000000000 +0100
235 +++ xemacs-21.5.21/man/Makefile 2005-06-02 12:51:27.000000000 +0200
237 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
238 # Boston, MA 02111-1307, USA.
245 diff -ru xemacs-21.5.21.orig/modules/base64/Makefile xemacs-21.5.21/modules/base64/Makefile
246 --- xemacs-21.5.21.orig/modules/base64/Makefile 2001-04-12 20:22:33.000000000 +0200
247 +++ xemacs-21.5.21/modules/base64/Makefile 2005-06-02 12:51:27.000000000 +0200
256 CC=../../lib-src/ellcc
257 diff -ru xemacs-21.5.21.orig/modules/common/Makefile.common xemacs-21.5.21/modules/common/Makefile.common
258 --- xemacs-21.5.21.orig/modules/common/Makefile.common 2004-11-08 16:14:52.000000000 +0100
259 +++ xemacs-21.5.21/modules/common/Makefile.common 2005-06-02 12:51:27.000000000 +0200
262 #include "../../src/config.h"
270 extraclean: distclean
272 install: $(OBJECT_TO_BUILD)
273 - $(INSTALL_PROGRAM) $< $(INSTALLPATH)
274 + $(INSTALL_PROGRAM) $< $(DESTDIR)$(INSTALLPATH)
275 diff -ru xemacs-21.5.21.orig/modules/zlib/Makefile xemacs-21.5.21/modules/zlib/Makefile
276 --- xemacs-21.5.21.orig/modules/zlib/Makefile 2001-04-12 20:22:40.000000000 +0200
277 +++ xemacs-21.5.21/modules/zlib/Makefile 2005-06-02 12:51:27.000000000 +0200
286 CC=../../lib-src/ellcc
287 diff -ru xemacs-21.5.21.orig/netinstall/Makefile.in.in xemacs-21.5.21/netinstall/Makefile.in.in
288 --- xemacs-21.5.21.orig/netinstall/Makefile.in.in 2001-12-20 06:49:40.000000000 +0100
289 +++ xemacs-21.5.21/netinstall/Makefile.in.in 2005-06-02 12:51:27.000000000 +0200
292 ## Makefile for Cygwin installer
296 ## For performance and consistency, no built-in rules
298 .SUFFIXES: .c .cc .h .o
301 @echo; echo "Installing net setup."
302 for file in ${INSTALLABLES} ; do \
303 - (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \
304 + (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \
307 version.c : $(srcdir)/ChangeLog Makefile
308 diff -ru xemacs-21.5.21.orig/src/Makefile.in.in xemacs-21.5.21/src/Makefile.in.in
309 --- xemacs-21.5.21.orig/src/Makefile.in.in 2005-04-09 01:11:18.000000000 +0200
310 +++ xemacs-21.5.21/src/Makefile.in.in 2005-06-02 12:51:27.000000000 +0200
312 RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
320 @@ -1045,7 +1047,7 @@
322 MAKEPATH=../lib-src/make-path
324 - $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s
325 + $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s
326 -@echo "Copying include files for ellcc..."
328 cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \
329 @@ -1059,12 +1061,12 @@
330 test -d s && hdrtars="$$hdrtars s/*"; \
331 test -d m && hdrtars="$$hdrtars m/*"; \
332 test -n "$$hdrtars" && (tar cf - $$hdrtars) | \
333 - (cd $(archlibdir)/include && umask 022 && tar xf -); \
334 - chmod 755 $(archlibdir)/include; \
335 - test -d $(archlibdir)/include/s && \
336 - chmod 755 $(archlibdir)/include/s; \
337 - test -d $(archlibdir)/include/m && \
338 - chmod 755 $(archlibdir)/include/s;) \
339 + (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \
340 + chmod 755 $(DESTDIR)$(archlibdir)/include; \
341 + test -d $(DESTDIR)$(archlibdir)/include/s && \
342 + chmod 755 $(DESTDIR)$(archlibdir)/include/s; \
343 + test -d $(DESTDIR)$(archlibdir)/include/m && \
344 + chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \
348 xemacs-21.5.21/srcだけに発見: Makefile.in.in.orig
349 diff -ru xemacs-21.5.21.orig/tests/tooltalk/Makefile xemacs-21.5.21/tests/tooltalk/Makefile
350 --- xemacs-21.5.21.orig/tests/tooltalk/Makefile 1996-12-18 23:44:15.000000000 +0100
351 +++ xemacs-21.5.21/tests/tooltalk/Makefile 2005-06-02 12:51:27.000000000 +0200
359 CPPFLAGS = -I/usr/openwin/include
360 CFLAGS = -g -v -DNeedFunctionPrototypes