rpm/xemacs
SHA256
1
0
Fork 0
forked from pool/xemacs
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=41

Browse Source
This commit is contained in:
OBS User unknown
2009-06-17 13:52:36 +00:00
committed by Git OBS Bridge
parent ca3648a036
commit fbac23a4ae
29 changed files with 676 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
destdir.patch
View File

@@ -1,7 +1,8 @@
diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
--- xemacs-21.5.24.orig/Makefile.in.in 2005-12-27 18:11:00.000000000 +0100
+++ xemacs-21.5.24/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100
@@ -61,6 +61,8 @@
Index: xemacs-21.5.29/Makefile.in.in
===================================================================
--- xemacs-21.5.29.orig/Makefile.in.in
+++ xemacs-21.5.29/Makefile.in.in
@@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS=
RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
#endif
@@ -10,7 +11,7 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
SHELL = /bin/sh
LANG = C
LC_ALL = C
@@ -382,35 +384,35 @@
@@ -394,18 +396,18 @@ install-arch-dep: mkdir
(cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
archlibdir=${archlibdir}) ; done
@@ -33,25 +34,19 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
+ ${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
#endif
#ifdef WIN32_NATIVE
- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
- -chmod 0755 ${bindir}/${PROGNAME}
+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}
+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}
#else
# ifdef CYGWIN
- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe
- -chmod 0755 ${bindir}/${PROGNAME}-${version}.exe
- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
+ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
@@ -417,14 +419,14 @@ install-arch-dep: mkdir
cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME}
# else
- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
- -chmod 0755 ${bindir}/${PROGNAME}-${version}
- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
- cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}
+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}
+ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
+ cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
# endif /* CYGWIN */
#endif /* WIN32_NATIVE */
if test "${prefix}" != "${exec_prefix}"; then \
@@ -60,7 +55,7 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
for dir in \
lib/${inststaticdir} \
lib/${instvardir}/etc \
@@ -421,13 +423,13 @@
@@ -435,13 +437,13 @@ install-arch-dep: mkdir
done; \
fi
#ifdef HAVE_SHLIB
@@ -76,7 +71,7 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
"`(cd $${dir} && $(pwd))`"; then \
: do nothing - echo "rm -rf $$1" ; \
fi ; \
@@ -435,35 +437,35 @@
@@ -449,35 +451,35 @@ install-arch-indep: mkdir info
done
-set ${COPYDESTS} ; \
for dir in ${COPYDESTS} ; do \
@@ -124,7 +119,7 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
done
@echo "If you would like to save approximately 4M of disk space, do"
@echo "make gzip-el"
@@ -473,19 +475,23 @@
@@ -487,19 +489,23 @@ install-arch-indep: mkdir info
@echo "${lispdir}"
gzip-el:
@@ -151,11 +146,12 @@ diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in
+ ${MAKEPATH} $(DESTDIR)$${dir} ; \
+ done ;
## Delete all the installed files that the `install' target would
## create (but not the noninstalled files such as `make all' would
diff -ru xemacs-21.5.24.orig/dynodump/Makefile.in.in xemacs-21.5.24/dynodump/Makefile.in.in
--- xemacs-21.5.24.orig/dynodump/Makefile.in.in 2005-12-27 18:11:04.000000000 +0100
+++ xemacs-21.5.24/dynodump/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100
## Install bundled packages, if present.
Index: xemacs-21.5.29/dynodump/Makefile.in.in
===================================================================
--- xemacs-21.5.29.orig/dynodump/Makefile.in.in
+++ xemacs-21.5.29/dynodump/Makefile.in.in
@@ -22,6 +22,8 @@
## Synched up with: Not synched with FSF.
@@ -165,18 +161,20 @@ diff -ru xemacs-21.5.24.orig/dynodump/Makefile.in.in xemacs-21.5.24/dynodump/Mak
## For performance and consistency, no built-in rules.
.SUFFIXES:
.SUFFIXES: .c .o .i .h
diff -ru xemacs-21.5.24.orig/etc/tests/external-widget/Makefile xemacs-21.5.24/etc/tests/external-widget/Makefile
--- xemacs-21.5.24.orig/etc/tests/external-widget/Makefile 1996-12-18 23:42:31.000000000 +0100
+++ xemacs-21.5.24/etc/tests/external-widget/Makefile 2005-12-27 19:00:48.000000000 +0100
Index: xemacs-21.5.29/etc/tests/external-widget/Makefile
===================================================================
--- xemacs-21.5.29.orig/etc/tests/external-widget/Makefile
+++ xemacs-21.5.29/etc/tests/external-widget/Makefile
@@ -1,3 +1,5 @@
+DESTDIR=
+
CFLAGS += -Xc -g -DTOOLTALK
EMACSHOME = ../../..
EMACSLIBDIR = $(EMACSHOME)/editor/src
diff -ru xemacs-21.5.24.orig/lib-src/Makefile.in.in xemacs-21.5.24/lib-src/Makefile.in.in
--- xemacs-21.5.24.orig/lib-src/Makefile.in.in 2005-12-27 18:11:23.000000000 +0100
+++ xemacs-21.5.24/lib-src/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100
Index: xemacs-21.5.29/lib-src/Makefile.in.in
===================================================================
--- xemacs-21.5.29.orig/lib-src/Makefile.in.in
+++ xemacs-21.5.29/lib-src/Makefile.in.in
@@ -24,6 +24,8 @@
## above a certain point in this file are in shell format instead of
## in C format. How the hell is this supposed to work? */
@@ -186,7 +184,7 @@ diff -ru xemacs-21.5.24.orig/lib-src/Makefile.in.in xemacs-21.5.24/lib-src/Makef
## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .h .o
@@ -244,26 +246,26 @@
@@ -246,26 +248,26 @@ do-blessmail: $(blessmail)
## just run them directly from lib-src.
${archlibdir}: all
@echo; echo "Installing utilities run internally by XEmacs."
@@ -218,9 +216,10 @@ diff -ru xemacs-21.5.24.orig/lib-src/Makefile.in.in xemacs-21.5.24/lib-src/Makef
done
uninstall:
diff -ru xemacs-21.5.24.orig/lwlib/Makefile.in.in xemacs-21.5.24/lwlib/Makefile.in.in
--- xemacs-21.5.24.orig/lwlib/Makefile.in.in 2005-12-27 18:11:45.000000000 +0100
+++ xemacs-21.5.24/lwlib/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100
Index: xemacs-21.5.29/lwlib/Makefile.in.in
===================================================================
--- xemacs-21.5.29.orig/lwlib/Makefile.in.in
+++ xemacs-21.5.29/lwlib/Makefile.in.in
@@ -22,6 +22,8 @@
## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
## Boston, MA 02111-1307, USA.
@@ -230,9 +229,10 @@ diff -ru xemacs-21.5.24.orig/lwlib/Makefile.in.in xemacs-21.5.24/lwlib/Makefile.
## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .h .o .i .s
diff -ru xemacs-21.5.24.orig/man/Makefile xemacs-21.5.24/man/Makefile
--- xemacs-21.5.24.orig/man/Makefile 2005-12-27 18:11:52.000000000 +0100
+++ xemacs-21.5.24/man/Makefile 2005-12-27 19:00:48.000000000 +0100
Index: xemacs-21.5.29/man/Makefile
===================================================================
--- xemacs-21.5.29.orig/man/Makefile
+++ xemacs-21.5.29/man/Makefile
@@ -20,6 +20,8 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
@@ -242,9 +242,10 @@ diff -ru xemacs-21.5.24.orig/man/Makefile xemacs-21.5.24/man/Makefile
SHELL = /bin/sh
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
diff -ru xemacs-21.5.24.orig/modules/base64/Makefile xemacs-21.5.24/modules/base64/Makefile
--- xemacs-21.5.24.orig/modules/base64/Makefile 2001-04-12 20:22:33.000000000 +0200
+++ xemacs-21.5.24/modules/base64/Makefile 2005-12-27 19:00:48.000000000 +0100
Index: xemacs-21.5.29/modules/base64/Makefile
===================================================================
--- xemacs-21.5.29.orig/modules/base64/Makefile
+++ xemacs-21.5.29/modules/base64/Makefile
@@ -7,6 +7,8 @@
# 'installed'.
#
@@ -254,9 +255,10 @@ diff -ru xemacs-21.5.24.orig/modules/base64/Makefile xemacs-21.5.24/modules/base
SHELL=/bin/sh
RM=rm -f
CC=../../lib-src/ellcc
diff -ru xemacs-21.5.24.orig/modules/common/Makefile.common xemacs-21.5.24/modules/common/Makefile.common
--- xemacs-21.5.24.orig/modules/common/Makefile.common 2005-12-27 18:11:58.000000000 +0100
+++ xemacs-21.5.24/modules/common/Makefile.common 2005-12-27 19:01:49.000000000 +0100
Index: xemacs-21.5.29/modules/common/Makefile.common
===================================================================
--- xemacs-21.5.29.orig/modules/common/Makefile.common
+++ xemacs-21.5.29/modules/common/Makefile.common
@@ -31,6 +31,8 @@
#define NOT_C_CODE
#include "../../src/config.h"
@@ -266,7 +268,7 @@ diff -ru xemacs-21.5.24.orig/modules/common/Makefile.common xemacs-21.5.24/modul
SHELL=/bin/sh
RM=rm -f
PROGNAME=@PROGNAME@
@@ -98,7 +100,7 @@
@@ -98,7 +100,7 @@ extraclean: realclean
-$(RM) *~ \#*
install: $(OBJECT_TO_BUILD)
@@ -275,9 +277,10 @@ diff -ru xemacs-21.5.24.orig/modules/common/Makefile.common xemacs-21.5.24/modul
##
## Local Variables:
diff -ru xemacs-21.5.24.orig/modules/zlib/Makefile xemacs-21.5.24/modules/zlib/Makefile
--- xemacs-21.5.24.orig/modules/zlib/Makefile 2001-04-12 20:22:40.000000000 +0200
+++ xemacs-21.5.24/modules/zlib/Makefile 2005-12-27 19:00:48.000000000 +0100
Index: xemacs-21.5.29/modules/zlib/Makefile
===================================================================
--- xemacs-21.5.29.orig/modules/zlib/Makefile
+++ xemacs-21.5.29/modules/zlib/Makefile
@@ -8,6 +8,8 @@
# 'installed'.
#
@@ -287,9 +290,10 @@ diff -ru xemacs-21.5.24.orig/modules/zlib/Makefile xemacs-21.5.24/modules/zlib/M
SHELL=/bin/sh
RM=rm -f
CC=../../lib-src/ellcc
diff -ru xemacs-21.5.24.orig/netinstall/Makefile.in.in xemacs-21.5.24/netinstall/Makefile.in.in
--- xemacs-21.5.24.orig/netinstall/Makefile.in.in 2005-12-27 18:11:58.000000000 +0100
+++ xemacs-21.5.24/netinstall/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100
Index: xemacs-21.5.29/netinstall/Makefile.in.in
===================================================================
--- xemacs-21.5.29.orig/netinstall/Makefile.in.in
+++ xemacs-21.5.29/netinstall/Makefile.in.in
@@ -14,6 +14,8 @@
##
## Makefile for Cygwin installer
@@ -299,7 +303,7 @@ diff -ru xemacs-21.5.24.orig/netinstall/Makefile.in.in xemacs-21.5.24/netinstall
## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .cc .h .o
@@ -172,7 +174,7 @@
@@ -173,7 +175,7 @@ setup-bin.ini:
install:
@echo; echo "Installing net setup."
for file in ${INSTALLABLES} ; do \
@@ -308,10 +312,11 @@ diff -ru xemacs-21.5.24.orig/netinstall/Makefile.in.in xemacs-21.5.24/netinstall
done
version.c : $(srcdir)/ChangeLog Makefile
diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.in
--- xemacs-21.5.24.orig/src/Makefile.in.in 2005-12-27 18:12:02.000000000 +0100
+++ xemacs-21.5.24/src/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100
@@ -39,6 +39,8 @@
Index: xemacs-21.5.29/src/Makefile.in.in
===================================================================
--- xemacs-21.5.29.orig/src/Makefile.in.in
+++ xemacs-21.5.29/src/Makefile.in.in
@@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS=
RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
#endif
@@ -320,7 +325,7 @@ diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.i
PROGNAME=@PROGNAME@
prefix=@prefix@
SRC=@srcdir@
@@ -1068,7 +1070,7 @@
@@ -1065,7 +1067,7 @@ relock:
#ifdef HAVE_SHLIB
MAKEPATH=../lib-src/make-path
install: $(PROGNAME)
@@ -329,7 +334,7 @@ diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.i
-@echo "Copying include files for ellcc..."
-@hdir=`pwd`; \
cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \
@@ -1082,12 +1084,12 @@
@@ -1079,12 +1081,12 @@ install: $(PROGNAME)
test -d s && hdrtars="$$hdrtars s/*"; \
test -d m && hdrtars="$$hdrtars m/*"; \
test -n "$$hdrtars" && (tar cf - $$hdrtars) | \
@@ -348,9 +353,10 @@ diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.i
done)
#endif
diff -ru xemacs-21.5.24.orig/tests/tooltalk/Makefile xemacs-21.5.24/tests/tooltalk/Makefile
--- xemacs-21.5.24.orig/tests/tooltalk/Makefile 1996-12-18 23:44:15.000000000 +0100
+++ xemacs-21.5.24/tests/tooltalk/Makefile 2005-12-27 19:00:48.000000000 +0100
Index: xemacs-21.5.29/tests/tooltalk/Makefile
===================================================================
--- xemacs-21.5.29.orig/tests/tooltalk/Makefile
+++ xemacs-21.5.29/tests/tooltalk/Makefile
@@ -12,6 +12,8 @@
### Code: