On Wed, 2002-10-30 at 14:21, Didier Verna wrote:
cp --force --recursive --symbolic-link
/usr/local/src/XEmacs-Packages/mule-packages/locale/ChangeLog
/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/ja/locale-start.elc
/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/ro/locale-start.elc
/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/fr/locale-start.elc
/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/ja/locale-start.el
/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/ro/locale-start.el
/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/fr/locale-start.el
/usr/local/src/XEmacs-Packages/mule-packages/locale/./auto-autoloads.elc
/usr/local/src/XEmacs-Packages/mule-packages/locale/./auto-autoloads.el
/usr/local/src/XEmacs-Packages/mule-packages/locale/./_pkg.el \
/usr/local/share/xemacs/mule-packages/lisp/locale
cp: will not overwrite just-created
`/usr/local/share/xemacs/mule-packages/lisp/locale/locale-start.elc' with
`/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/ro/locale-start.elc'
cp: will not overwrite just-created
`/usr/local/share/xemacs/mule-packages/lisp/locale/locale-start.elc' with
`/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/fr/locale-start.elc'
cp: will not overwrite just-created
`/usr/local/share/xemacs/mule-packages/lisp/locale/locale-start.el' with
`/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/ro/locale-start.el'
cp: will not overwrite just-created
`/usr/local/share/xemacs/mule-packages/lisp/locale/locale-start.el' with
`/usr/local/src/XEmacs-Packages/mule-packages/locale/start-files/fr/locale-start.el'
make[1]: *** [binkit-common] Error 1
make[1]: Leaving directory `/usr/local/src/XEmacs-Packages/mule-packages/locale'
make: *** [mule-packages/locale/MULE.install] Error 2
Ouch, and thanks for the catch. This affects non-symlinked "make
install" too, but these are only warnings there. And results in "make
bindist" to copy one of these locale-start.el(c?)'s into lisp/locale/ in
the tarball, which seems wrong to me.
The patch below works for me, but is kind of ugly. If someone comes up
with a more elegant solution, I'd be grateful; otherwise I'll commit
this tomorrow.
Index: mule-packages/locale/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/locale/Makefile,v
retrieving revision 1.24
diff -a -u -r1.24 Makefile
--- mule-packages/locale/Makefile 17 Oct 2002 20:56:09 -0000 1.24
+++ mule-packages/locale/Makefile 30 Oct 2002 20:08:35 -0000
@@ -45,6 +45,12 @@
include ../../XEmacs.rules
+# Override the default behaviour of including ELCS and the corresponding *.el
+# in files to be copied, they're handled with DATA_*(FILES|DEST) here due to
+# the dir/filename structure.
+SOURCE_FILES_TO_COPY = \
+ $(GENERATED) $(GENERATED:.elc=.el) $(AUTOLOAD_PATH)/_pkg.el
+
ifeq ($(BUILD_WITHOUT_MULE),)
all:: $(ELCS) auto-autoloads.elc
--
\/ille Skyttä
scop at
xemacs.org