Dear Big Brothers,
I'm going to apply the following patch to the CVS archive. This fixes
the remaining problems in the XEmacs package installation. There are new
Makefiles.in's in the utils and tex directories.
** You need to rerun autoconf after updating **
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bbdb/bbdb/Makefile.in,v
retrieving revision 1.2
diff -u -w -r1.2 Makefile.in
--- Makefile.in 2001/01/24 23:46:45 1.2
+++ Makefile.in 2001/02/02 13:44:12
@@ -1,11 +1,5 @@
@SET_MAKE@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-
-LN_S = @LN_S@
TAR = @TAR@
COMPRESS = @COMPRESS@
COMPEXT = @COMPEXT@
@@ -13,11 +7,8 @@
ETAGS = @ETAGS@
EMACS = @EMACS@ -no-site-file -no-init-file
-PACKAGEDIR = @PACKAGEDIR@
-SYMLINKS = @SYMLINKS@
-LINKPATH = @LINKPATH@
+SUBDIRS = lisp texinfo tex utils
-# Deployment
TARFILES = ChangeLog INSTALL Makefile README \
aclocal.m4 configure configure.in install-sh Makefile.in \
bits lisp misc tex texinfo utils
@@ -44,70 +35,60 @@
gnus:
cd lisp; $(MAKE) gnus
+info:
+ cd texinfo; $(MAKE) info
+
autoloads:
cd lisp; $(MAKE) autoloads
autoloadsc:
cd lisp; $(MAKE) autoloadsc
-install-pkg: bbdb autoloadsc info
- rm -fr $(PACKAGEDIR)/lisp/bbdb $(PACKAGEDIR)/info/bbdb \
- $(PACKAGEDIR)/etc/bbdb; \
- if test "x$(SYMLINKS)" = "xno" ; then \
- mkdir -p -m 0755 $(PACKAGEDIR)/lisp/bbdb; \
- for i in `ls lisp/*.elc` ; do \
- $(INSTALL_DATA) `echo $$i | sed 's/c$$//g'` \
- $(PACKAGEDIR)/lisp/bbdb ; \
- $(INSTALL_DATA) $$i $(PACKAGEDIR)/lisp/bbdb ; \
- done ; \
- mkdir -p -m 0755 $(PACKAGEDIR)/info/bbdb ; \
- for i in `ls texinfo/*.info* ` ; do \
- $(INSTALL_DATA) $$i $(PACKAGEDIR)/info/bbdb ; \
- done ; \
- mkdir -p -m 0755 $(PACKAGEDIR)/etc/bbdb/tex \
- $(PACKAGEDIR)/etc/bbdb/utils ; \
- for i in `ls tex/*.tex` ; do \
- $(INSTALL_DATA) $$i $(PACKAGEDIR)/etc/bbdb/tex ; \
- done ; \
- for i in `ls -d utils/* |egrep -v '(RCS|SCCS|CVS)'` ; do \
- $(INSTALL_DATA) $$i $(PACKAGEDIR)/etc/bbdb/utils ; \
- done ; \
- else \
- if test "x$(LINKPATH)" = "x" ; then \
- ln -s `pwd`/lisp $(PACKAGEDIR)/lisp/bbdb ; \
- ln -s `pwd`/texinfo $(PACKAGEDIR)/info/bbdb ; \
- else \
- ln -s $(LINKPATH)/lisp $(PACKAGEDIR)/lisp/bbdb ; \
- ln -s $(LINKPATH)/texinfo $(PACKAGEDIR)/info/bbdb ; \
- fi ; \
- fi
+install-pkg:
+ @for i in $(SUBDIRS) ; do \
+ ( cd $$i && $(MAKE) install-pkg ) ; \
+ done
+
+uninstall-pkg:
+ @for i in $(SUBDIRS) ; do \
+ ( cd $$i && $(MAKE) uninstall-pkg ) ; \
+ done
-info:
- cd texinfo; $(MAKE) info
+local-clean:
-clean:
+clean: local-clean
cd lisp; $(MAKE) clean
cd texinfo; $(MAKE) clean
-
-distclean: clean
- cd texinfo; $(MAKE) distclean
- cd lisp; $(MAKE) distclean
- $(RM) -f config.status config.cache config.status config.log
- $(RM) *.tar.gz
- $(RM) .#*
-cvsclean: distclean # configure & Makefile are in CVS, but shouldn't be.
+local-distclean: local-clean
+ -$(RM) config.cache config.status config.log
+ -$(RM) *.tar.gz
+ -$(RM) .#*
+
+distclean: local-distclean
+ @for i in $(SUBDIRS) ; do \
+ ( cd $$i && $(MAKE) distclean ) ; \
+ done
# Backward compatibility
reallyclean: distclean
+local-cvsclean: local-distclean
+ -$(RM) Makefile configure
+
+cvsclean: local-cvsclean
+ @for i in $(SUBDIRS) ; do \
+ ( cd $$i && $(MAKE) cvsclean ) ; \
+ done
+
+
# tarball
tar: $(TARFILES)
@if test "x$(TAR)" = "x" ; then \
echo "Sorry, no \`tar' program available." ; \
else \
name=`sed -n 's/^(defconst bbdb-version
"\([0-9]\.[0-9][0-9]*\).*/bbdb-\1/p' lisp/bbdb.el` ;
\
- rm -f $${name} ; $(LN_S) . $${name} ; \
+ $(RM) $${name} ; $(LN_S) . $${name} ; \
if test "x$(COMPRESS)" = "x" ; then \
echo "Sorry, no compression program available." ; \
echo "The tarball will not be compressed." ; \
@@ -120,7 +101,7 @@
| sed "s|^|$${name}/|g; s| | $${name}/|g"` \
| $(COMPRESS) > $${name}.tar.$(COMPEXT) ; \
fi ; \
- rm $${name} ; \
+ $(RM) $${name} ; \
fi
dist: distclean info autoloads tar
Index: configure.in
===================================================================
RCS file: /cvsroot/bbdb/bbdb/configure.in,v
retrieving revision 1.1
diff -u -w -r1.1 configure.in
--- configure.in 2001/01/08 15:34:16 1.1
+++ configure.in 2001/02/02 13:44:12
@@ -81,4 +81,4 @@
[ --with-linkpath=PATH path to symlink from if \`pwd' does not work],
[ LINKPATH="${withval}" ])
-AC_OUTPUT(Makefile lisp/Makefile texinfo/Makefile)
+AC_OUTPUT(Makefile lisp/Makefile texinfo/Makefile tex/Makefile utils/Makefile)
Index: lisp/Makefile.in
===================================================================
RCS file: /cvsroot/bbdb/bbdb/lisp/Makefile.in,v
retrieving revision 1.2
diff -u -w -r1.2 Makefile.in
--- lisp/Makefile.in 2001/01/24 23:45:02 1.2
+++ lisp/Makefile.in 2001/02/02 13:44:15
@@ -1,5 +1,12 @@
@SET_MAKE@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_DATA = @INSTALL_DATA@
+
+LN_S = @LN_S@
+
EMACS = @EMACS@ -no-site-file -no-init-file
GNUSDIR = @GNUSDIR@
@@ -7,6 +14,10 @@
VMDIR = @VMDIR@
OTHERDIRS = @OTHERDIRS@
+PACKAGEDIR = @PACKAGEDIR@
+SYMLINKS = @SYMLINKS@
+LINKPATH = @LINKPATH@
+
# this is lovely, isn't it? Surprisingly enough, it seems to work...
VM = -eval '(progn (if (not (string-match "$(VMDIR)" "")) \
(setq load-path (cons "$(VMDIR)" load-path))) \
@@ -60,6 +71,25 @@
all: rmail gnus vm mhe bbdb info autoloadsc
+install-pkg: uninstall-pkg bbdb autoloadsc
+ @if test "x$(SYMLINKS)" = "xno" ; then \
+ mkdir -p -m 0755 $(PACKAGEDIR)/lisp/bbdb; \
+ for i in `ls *.elc` ; do \
+ $(INSTALL_DATA) `echo $$i | sed 's/c$$//g'` \
+ $(PACKAGEDIR)/lisp/bbdb ; \
+ $(INSTALL_DATA) $$i $(PACKAGEDIR)/lisp/bbdb ; \
+ done ; \
+ else \
+ if test "x$(LINKPATH)" = "x" ; then \
+ $(LN_S) `pwd` $(PACKAGEDIR)/lisp/bbdb ; \
+ else \
+ $(LN_S) $(LINKPATH)/lisp $(PACKAGEDIR)/lisp/bbdb ; \
+ fi ; \
+ fi
+
+uninstall-pkg:
+ -$(RM) -r $(PACKAGEDIR)/lisp/bbdb
+
bbdb-autoloads.el: $(DEPSRCS)
@rm -f $@;
@echo " " > $@;
@@ -136,10 +166,13 @@
# Assorted clean-up targets
clean:
- $(RM) -f bbdb*.elc
+ -$(RM) bbdb*.elc
distclean: clean
+# Backward compatibility
+reallyclean: distclean
+
cvsclean: distclean
- $(RM) -f bbdb-autoloads.el # Generated file
- $(RM) -f Makefile
+ -$(RM) bbdb-autoloads.el # Generated file
+ -$(RM) Makefile
Index: texinfo/Makefile.in
===================================================================
RCS file: /cvsroot/bbdb/bbdb/texinfo/Makefile.in,v
retrieving revision 1.2
diff -u -w -r1.2 Makefile.in
--- texinfo/Makefile.in 2001/01/24 23:49:34 1.2
+++ texinfo/Makefile.in 2001/02/02 13:44:15
@@ -1,9 +1,40 @@
@SET_MAKE@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_DATA = @INSTALL_DATA@
+
+LN_S = @LN_S@
+
MAKEINFO = @MAKEINFO@
+PACKAGEDIR = @PACKAGEDIR@
+SYMLINKS = @SYMLINKS@
+LINKPATH = @LINKPATH@
+
all: info bbdb.dvi
+install-pkg: uninstall-pkg info
+ @if test "x$(SYMLINKS)" = "xno" ; then \
+ for i in `ls bbdb.info* ` ; do \
+ $(INSTALL_DATA) $$i $(PACKAGEDIR)/info/ ; \
+ done ; \
+ else \
+ if test "x$(LINKPATH)" = "x" ; then \
+ for i in `ls bbdb.info* ` ; do \
+ $(LN_S) `pwd`/$$i $(PACKAGEDIR)/info/$$i ; \
+ done ; \
+ else \
+ for i in `ls bbdb.info* ` ; do \
+ $(LN_S) $(LINKPATH)/texinfo/$$i $(PACKAGEDIR)/info/$$i ; \
+ done ; \
+ fi ; \
+ fi
+
+uninstall-pkg:
+ -$(RM) $(PACKAGEDIR)/info/bbdb.info*
+
info: bbdb.info
bbdb.info: bbdb.texinfo
@@ -28,14 +59,14 @@
fi
clean:
- $(RM) -f *.aux *.cp *.cps *.dvi *.pdf *.fn *.fns *.ky *.log *.pg \
+ -$(RM) *.aux *.cp *.cps *.dvi *.pdf *.fn *.fns *.ky *.log *.pg \
*.toc *.tp *.vr *.vrs
+# Backward compatibility
reallyclean: distclean
distclean: clean
- $(RM) -f bbdb.info*
+ -$(RM) bbdb.info*
cvsclean: distclean
- $(RM) -f Makefile
-
+ -$(RM) Makefile
Index: texinfo/bbdb.texinfo
===================================================================
RCS file: /cvsroot/bbdb/bbdb/texinfo/bbdb.texinfo,v
retrieving revision 1.35
diff -u -w -r1.35 bbdb.texinfo
--- texinfo/bbdb.texinfo 2001/01/08 15:37:26 1.35
+++ texinfo/bbdb.texinfo 2001/02/02 13:44:38
@@ -533,54 +533,54 @@
This option sets the root of the XEmacs package directory. By default,
@file{/usr/local/lib/xemacs/site-packages} is used.
@item @code{--with-symlinks}
-If this option is used, the @file{lisp} and @file{info} directories will
-be installed as links to the source ones. Otherwise, they will be
-copied to the appropriate place.
+If this option is used, the installation will be done by making symbolic
+links to the sources instead of copying the files.
@item @code{--with-linkpath=PATH}
-Without this variable, the @file{lisp} and @file{info} directories will
-be linked in with the output of @code{pwd} as the source directory. If
-something else should be used as the source directory, you should pass
-the 'something else' to @code{--with-linkpath}. If, for example,
-@code{pwd} returns @file{/p/local/elisp/bbdb}, the @file{lisp},
-@file{info} and @file{etc} (which will include the files distributed in
-@file{tex} and @file{utils}) directories will be linked in from
-@file{/p/local/elisp/bbdb/@{lisp,info,etc@}}. If, however, you prefer
-that they be linked in from @file{/usr/local/elisp/bbdb/...}, say
+Without this option, the installation process uses the output of
+@code{pwd} to determine the current directory. If something else should
+be used, you should provide an alternate name for the BBDB toplevel
+directory by using @code{--with-linkpath}. If, for example, @code{pwd}
+returns @file{/p/local/elisp/bbdb}, but you prefer to use
+@file{/usr/local/elisp/bbdb/...} for the links, usr this:
@code{configure --with-linkpath=/usr/local/elisp/bbdb}. This option is
ignored if @code{--with-symlinks} is not used.
@end table
-To perform the installation, use the command @code{make install-pkg}.
+To perform the (un)installation, use the command @code{make (un)install-pkg}.
This will compile the @file{lisp/auto-autoloads.el} file and will
-install the source and documentation files at the appropriate places.
-The final installation tree will take the following form:
+install the appropriate files to the appropriate places. The final
+installation tree will take the following form:
@table @code
- @item $PACKAGEROOT/
+ @item $(PACKAGEDIR)/
@table @code
- @item etc/
+ @item lisp/
@table @code
@item bbdb/
- @table @code
- @item tex/
- @i{support files for bbdb-print, copied from the @file{tex} directory
- in the source distribution}
- @item utils/
- @i{miscellaneous utilities, copied from the @file{utils} directory in
- the source distribution}
- @end table
+ @i{@b{BBDB} lisp source files. This directory contains a copy of all
+@code{.el} and @code{.elc} files from the @file{lisp} source directory,
+or is a symbolic link to it.}
@end table
@item info/
@table @code
- @item bbdb/
- @i{@b{BBDB} documentation files, copied from the @file{info} directory
- in the source distribution}
+ @item bbdb.info*
+ @i{@b{BBDB} documentation files. These are either copies of the info
+files from the @file{texinfo} source directory, or are symbolic links to
+them.}
@end table
- @item lisp/
+ @item etc/
@table @code
@item bbdb/
- @i{@b{BBDB} lisp source files, copied from the @file{lisp} directory
- in the source distribution}
+ @table @code
+ @item tex/
+ @i{@b{BBDB} support files for bbdb-print. This directory contains a
+copy of the appropriate files from the @file{tex} source directory, or
+is a symbolic link to it.}
+ @item utils/
+ @i{@b{BBDB} miscellaneous utilities. This directory contains a copy
+of the appropriate files from the @file{utils} source directory, or is a
+symbolic link to it.}
+ @end table
@end table
@end table
@end table
--
/ / _ _ Didier Verna http://www.lrde.epita.fr/~didier
- / / - / / /_/ / EPITA / LRDE mailto:[EMAIL PROTECTED]
/_/ / /_/ / /__ / 14-16 rue Voltaire Tel. +33 (1) 53 14 59 47
94276 Kremlin-Bicêtre cedex Fax. +33 (1) 44 08 01 99
_______________________________________________
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/bbdb-info
BBDB Home Page: http://bbdb.sourceforge.net/
