Re: [Sascha Wilde] [Patch] Fixes für Installations Prozess...

Le 4688 Septembre 1993, Stefan Reichör a tapoté:
> Hi!
>
> I have received the following patch for the DVC installation process.
>
> Shall I apply this patch?
>
> === modified file 'Makefile.in'
> --- Makefile.in	
> +++ Makefile.in	
> @@ -54,7 +54,7 @@
>  dvc-maybe: generated-files
>  	cd lisp; $(MAKE) maybe
>  
> -install: dvc-load.el
> +install: dvc-load-install.el
>  	@for i in $(SUBDIRS) ; do               \
>            $(MAKE) -C $$i install;               \
>          done

I'm not sure about this one

> === modified file 'configure.ac'
> --- configure.ac	
> +++ configure.ac	
> @@ -1,3 +1,4 @@
> +
>  # configure.ac --- configuration setup for DVC
>  
>  # Author:        Robert Widhopf-Fenk <hack@...>
> @@ -207,7 +208,7 @@
>        if test "x$theprefix" = "xNONE"; then
>    	theprefix=$ac_default_prefix
>        fi
> -      datadir="\$(prefix)/share"
> +      datadir="${theprefix}/share"
>        if test "$EMACS_FLAVOR" = "xemacs"; then
>            datadir="\$(prefix)/lib"
>            lispdir="${datadir}/${EMACS_FLAVOR}/site-packages/lisp/dvc"
> @@ -265,7 +266,7 @@
>      if test "$EMACS_FLAVOR" = "xemacs"; then
>        info_dir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/info"
>      else
> -      info_dir="\$(prefix)/share/info"
> +      info_dir="${theprefix}/share/info"
>      fi
>    else
>      info_dir=$infodir

I think the \${prefix} is required, for the debian package we define
the prefix to "where we put the file for the package", if we remove
the \ then the lispdir variable looze the information that it's
related to prefix, for example:

prefix = /home/nebu/usr
datadir= /share
datarootdir= ${prefix}/share
srcdir = .
lispdir= /share/emacs/site-lisp/dvc

So, with this we muse use ${prefix}/${lispdir}/ instead of just
${lispdir}.

I think it should not be applied.

> === modified file 'dvc-load-install.el.in'
> --- dvc-load-install.el.in	
> +++ dvc-load-install.el.in	
> @@ -16,7 +16,7 @@
>  (add-to-list 'load-path "@lispdir@/")
>  (unless (locate-library "ewoc")
>    (add-to-list 'load-path "@lispdir@/contrib"))
> -(add-to-list 'Info-default-directory-list "@info_dir@/info")
> +(add-to-list 'Info-default-directory-list "@info_dir@")
>  
>  (if (featurep 'xtla)
>      (tla-reload)

I agree, @info_dir@ is replaced by ${datarootdir}/info.

> === modified file 'lisp/Makefile.in'
> --- lisp/Makefile.in	
> +++ lisp/Makefile.in	
> @@ -41,15 +41,15 @@
>  # This entry will never install .el files if there are no .elc files.
>  install-el: autoloads
>  	$(INSTALL) -d -m 0755 $(lispdir)/
> -	if test -f "../dvc-load.el"; then                             \
> -	    echo "Install dvc-load.el in $(lispdir)/dvc-load.el"      \
> -	    $(INSTALL_DATA) ../dvc-load.el $(lispdir)/;               \
> +	if test -f "../dvc-load-install.el"; then                          \
> +	    echo "Install dvc-load.el in $(lispdir)/dvc-load.el";          \
> +	    $(INSTALL_DATA) ../dvc-load-install.el $(lispdir)/dvc-load.el; \
>  	fi
>  	for elc in *.elc; do                                          \
>  	    el=`basename $$elc c`;                                    \
>  	    if test -f "$(srcdir)/$$el"; then                         \
>  	        echo "Install $$el in $(lispdir)/";                   \
> -	        $(INSTALL_DATA) $$el $(lispdir)/;                     \
> +	        $(INSTALL_DATA) $(srcdir)/$$el $(lispdir)/;           \
>  	    fi;                                                       \
>          done;
>  	CONTRIBELC=`ls -1 $(contribdir)/*.elc || /bin/true`;          \

In fact, we need to prefix all the sources with ${scrdir} since we can
compile in another directory.

I'll provide a complete patch for this.
--

-- 
Daniel 'NebuchadnezzaR' Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x2A408F69