* DESTDIR support patch
@ 2006-02-24 23:33 Claudio Fontana
0 siblings, 0 replies; only message in thread
From: Claudio Fontana @ 2006-02-24 23:33 UTC (permalink / raw)
[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]
Hello,
the attached patch adds DESTDIR variable support
to the emacs build system, thus enabling staged
installs.
I have then run tests along these lines:
# start by configuring the package with a custom
# prefix
$ ./configure --prefix=/home/claudio/tmp
# bootstrap normally as required
$ make bootstrap
# redirect installation
$ make install DESTDIR=/home/claudio/install-destdir
# check that no DESTDIR has been forgotten
$ ls /home/claudio/tmp
ls: /home/claudio/tmp: No such file or directory
# check that the staged installation works correctly
# in its final place
$ cd /home/claudio/install-destdir
$ mv home/claudio/tmp /home/claudio
$ cd /home/claudio/tmp/bin
$ ./emacs testfile.txt
...
And everything runs fine here.
Please consider for review/apply.
Note:
the patch is a p0 unified diff:
$ cd $top_srcdir
$ patch -p0 < /path/to/DESTDIR.p0.udiff
Claudio
___________________________________
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB
http://mail.yahoo.it
[-- Attachment #2: 1810061088-DESTDIR.p0.udiff --]
[-- Type: application/octet-stream, Size: 15838 bytes --]
--- ChangeLog.~1.457.~ 2006-02-14 16:32:55.000000000 +0100
+++ ChangeLog 2006-02-24 23:13:21.000000000 +0100
@@ -1,3 +1,8 @@
+2006-02-23 Claudio Fontana <claudio@gnu.org>
+
+ * Makefile.in: add DESTDIR variable to install
+ and uninstall targets to support staged installations.
+
2006-02-14 Richard M. Stallman <rms@gnu.org>
* configure.in (s390x-*-linux-gnu*): New configuration.
--- Makefile.in.~1.310.~ 2006-01-29 14:08:58.000000000 +0100
+++ Makefile.in 2006-02-24 23:11:43.000000000 +0100
@@ -250,7 +250,7 @@
# avoid nuking an existing dir file, so we don't do that here;
# instead, we have written out explicit code in the `install' targets.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
-COPYDESTS = ${etcdir} ${lispdir}
+COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir}
all: ${SUBDIR} leim
@@ -375,20 +375,20 @@
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} ${bindir}/$(EMACSFULL)
- -chmod 1755 ${bindir}/$(EMACSFULL)
- rm -f ${bindir}/$(EMACS)
- -ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS)
+ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL)
+ -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL)
+ rm -f $(DESTDIR)${bindir}/$(EMACS)
+ -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
-unset CDPATH; \
for f in `cd lib-src && echo fns-*.el`; do \
if test -r lib-src/$$f ; then \
- ${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \
+ ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \
else true; fi ; \
done
if test "${carbon_appdir}" != ""; then \
- umask 022; mkdir -p ${carbon_appdir}/Emacs.app; \
+ umask 022; mkdir -p $(DESTDIR)${carbon_appdir}/Emacs.app; \
(cd mac/Emacs.app; (tar -chf - . | \
- (cd ${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
+ (cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
&& cat > /dev/null))) || exit 1; \
fi
@@ -439,86 +439,86 @@
rm -f $${subdir}/dired.todo ; \
done) ; \
done
- -rm -f ${lispdir}/subdirs.el
- $(srcdir)/update-subdirs ${lispdir}
- if [ -f ${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
+ -rm -f $(DESTDIR)${lispdir}/subdirs.el
+ $(srcdir)/update-subdirs $(DESTDIR)${lispdir}
+ if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
- > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \
+ > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
fi
- chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el
- -if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
+ chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
+ -if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
- > ${datadir}/emacs/site-lisp/subdirs.el; \
+ > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \
fi
- -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
+ -chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
-unset CDPATH; \
- if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
+ if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
then \
- echo "Copying etc/DOC-* to ${docdir} ..." ; \
+ echo "Copying etc/DOC-* to $(DESTDIR)${docdir} ..." ; \
(cd ./etc; tar -chf - DOC*) \
- |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
- (cd $(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
+ |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
+ (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
else true; fi
-unset CDPATH; \
if [ -r ./lisp ] \
&& [ -r ./lisp/simple.el ] \
- && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
+ && [ x`(cd ./lisp; /bin/pwd)` != x`(cd $(DESTDIR)${lispdir}; /bin/pwd)` ] \
&& [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
then \
- echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
+ echo "Copying lisp/*.el and lisp/*.elc to $(DESTDIR)${lispdir} ..." ; \
(cd lisp; tar -chf - *.el *.elc) \
- |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
- (cd ${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; \
+ |(cd $(DESTDIR)${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
+ (cd $(DESTDIR)${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; \
else true; fi
-unset CDPATH; \
if [ -n "${GZIP_PROG}" ]; \
then \
echo "Compressing *.el ..." ; \
- (cd ${lispdir}; for f in `find . -name "*.elc" -print`; do \
+ (cd $(DESTDIR)${lispdir}; for f in `find . -name "*.elc" -print`; do \
${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \
done) \
else true; fi
-unset CDPATH; \
thisdir=`/bin/pwd`; \
- if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
then \
- (cd ${infodir}; \
+ (cd $(DESTDIR)${infodir}; \
if [ -f dir ]; then true; \
else \
(cd $${thisdir}; \
- ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \
- chmod a+r ${infodir}/dir); \
+ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
+ chmod a+r $(DESTDIR)${infodir}/dir); \
fi; \
cd ${srcdir}/info ; \
for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* emacs-mime* emacs-xtra* eshell* eudc* flymake* forms* gnus* idlwave* info* message* mh-e* newsticker* org* pcl-cvs* pgg* reftex* sc* ses* sieve* speedbar* tramp* vip* widget* woman* smtpmail* url* rcirc* erc*; do \
(cd $${thisdir}; \
- ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
- chmod a+r ${infodir}/$$f); \
+ ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f; \
+ chmod a+r $(DESTDIR)${infodir}/$$f); \
done); \
else true; fi
-unset CDPATH; \
thisdir=`/bin/pwd`; \
- if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
then \
for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime emacs-xtra eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg reftex sc ses sieve speedbar tramp vip viper widget woman smtpmail url rcirc erc; do \
(cd $${thisdir}; \
- ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$f); \
done; \
else true; fi
- -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
+ -chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir}
thisdir=`/bin/pwd`; \
cd ${srcdir}/etc; \
for page in emacs emacsclient etags ctags ; do \
(cd $${thisdir}; \
- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
- chmod a+r ${man1dir}/$${page}${manext}); \
+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
+ chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \
done
### Install LEIM files. Although they are machine-independent, we
@@ -537,15 +537,15 @@
### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
### instead of mkdir. Not all systems' mkdir programs have the `-p' flag.
mkdir: FRC
- if [ -d ${datadir} ]; then true; else \
- $(srcdir)/mkinstalldirs ${datadir}; \
- chmod a+r ${datadir};\
+ if [ -d $(DESTDIR)${datadir} ]; then true; else \
+ $(srcdir)/mkinstalldirs $(DESTDIR)${datadir}; \
+ chmod a+r $(DESTDIR)${datadir};\
fi
- $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \
- ${bindir} ${docdir} ${libexecdir} \
- ${datadir}/emacs/site-lisp \
- ${datadir}/emacs/${version}/site-lisp \
- `echo ${locallisppath} | sed 's/:/ /g'`
+ $(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
+ $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
+ $(DESTDIR)${datadir}/emacs/site-lisp \
+ $(DESTDIR)${datadir}/emacs/${version}/site-lisp \
+ $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
### Delete all the installed files that the `install' target would
### create (but not the noninstalled files such as `make all' would
@@ -558,24 +558,24 @@
prefix=${prefix} exec_prefix=${exec_prefix} \
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir})
-unset CDPATH; \
- for dir in ${lispdir} ${etcdir} ; do \
+ for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \
if [ -d $${dir} ]; then \
case `(cd $${dir} ; /bin/pwd)` in \
`(cd ${srcdir} ; /bin/pwd)`* ) ;; \
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
- ${datadir}/emacs/${version}/* ) \
- rm -rf ${datadir}/emacs/${version} \
+ $(DESTDIR)${datadir}/emacs/${version}/* ) \
+ rm -rf $(DESTDIR)${datadir}/emacs/${version} \
;; \
esac ; \
fi ; \
done
- (cd ${archlibdir} && rm -f fns-*)
- -rm -rf ${libexecdir}/emacs/${version}
- (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* emacs-xtra* flymake* forms* gnus* info* mh-e* newsticker* org* sc* ses* vip* smtpmail* url* rcirc* erc*)
- (cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
- (cd ${bindir} && rm -f $(EMACSFULL) $(EMACS))
+ (cd $(DESTDIR)${archlibdir} && rm -f fns-*)
+ -rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
+ (cd $(DESTDIR)${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* emacs-xtra* flymake* forms* gnus* info* mh-e* newsticker* org* sc* ses* vip* smtpmail* url* rcirc* erc*)
+ (cd $(DESTDIR)${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
+ (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS))
FRC:
--- lib-src/ChangeLog.~2.297.~ 2006-02-06 12:28:28.000000000 +0100
+++ lib-src/ChangeLog 2006-02-24 23:30:10.000000000 +0100
@@ -1,3 +1,8 @@
+2006-02-23 Claudio Fontana <claudio@gnu.org>
+
+ * Makefile.in: add DESTDIR variable to install
+ and uninstall targets to support staged installations.
+
2005-12-30 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (MOUSE_SUPPORT): Add tooltip.elc.
--- lib-src/Makefile.in.~1.147.~ 2006-02-06 12:28:28.000000000 +0100
+++ lib-src/Makefile.in 2006-02-24 23:23:36.000000000 +0100
@@ -285,11 +285,11 @@
maybe-blessmail: BLESSMAIL
#ifdef MOVEMAIL_NEEDS_BLESSING
/* Don\'t charge ahead and do it! Let the installer decide.
- ./blessmail ${archlibdir}/movemail${EXEEXT} */
+ ./blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT} */
@if [ `wc -l <blessmail` != 2 ] ; then \
dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
echo Assuming $$dir is really the mail spool directory, you should; \
- echo run lib-src/blessmail ${archlibdir}/movemail${EXEEXT}; \
+ echo run lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}; \
echo as root, to give movemail${EXEEXT} appropriate permissions.; \
echo Do that after running make install.; \
fi
@@ -297,50 +297,50 @@
/* Install the internal utilities. Until they are installed, we can
just run them directly from lib-src. */
-${archlibdir}: all
+$(DESTDIR)${archlibdir}: all
@echo
@echo "Installing utilities run internally by Emacs."
- $(top_srcdir)/mkinstalldirs ${archlibdir}
- if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)${archlibdir}
+ if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
for file in ${UTILITIES}; do \
- $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file ${archlibdir}/$$file ; \
+ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
done ; \
fi
- $(top_srcdir)/mkinstalldirs ${gamedir}
- touch ${gamedir}/snake-scores
- touch ${gamedir}/tetris-scores
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}
+ touch $(DESTDIR)${gamedir}/snake-scores
+ touch $(DESTDIR)${gamedir}/tetris-scores
/* If the following commands fail, that is not a big deal.
update-game-score will detect at runtime that it is not setuid,
and handle things accordingly. */
- -if chown ${gameuser} ${archlibdir}/update-game-score && chmod u+s ${archlibdir}/update-game-score; then \
- chown ${gameuser} ${gamedir}; \
- chmod u=rwx,g=rwx,o=rx ${gamedir}; \
+ -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \
+ chown ${gameuser} $(DESTDIR)${gamedir}; \
+ chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
fi
- if [ `(cd ${archlibdir} && /bin/pwd)` \
+ if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
!= `(cd ${srcdir} && /bin/pwd)` ]; then \
for file in ${SCRIPTS}; do \
- $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
+ $(INSTALL_PROGRAM) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
done ; \
fi
-install: ${archlibdir}
+install: $(DESTDIR)${archlibdir}
@echo
@echo "Installing utilities for users to run."
for file in ${INSTALLABLES} ; do \
- $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
- chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
+ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+ chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
done
for file in ${INSTALLABLE_SCRIPTS} ; do \
- $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
- chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
+ $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+ chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
done
uninstall:
- (cd ${bindir}; \
+ (cd $(DESTDIR)${bindir}; \
for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \
- rm -f ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+ rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
done)
- (cd ${archlibdir}; \
+ (cd $(DESTDIR)${archlibdir}; \
rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
mostlyclean:
--- leim/ChangeLog.~1.189.~ 2005-12-17 18:29:36.000000000 +0100
+++ leim/ChangeLog 2006-02-24 23:32:22.000000000 +0100
@@ -1,3 +1,8 @@
+2006-02-23 Claudio Fontana <claudio@gnu.org>
+
+ * Makefile.in: add DESTDIR variable to install target
+ to support staged installations.
+
2005-12-17 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(TIT), leim-list.el): Warn that parts of
--- leim/Makefile.in.~1.73.~ 2005-12-19 07:02:52.000000000 +0100
+++ leim/Makefile.in 2006-02-24 23:14:53.000000000 +0100
@@ -33,7 +33,7 @@
srcdir=@srcdir@
# Where to install LEIM files.
-INSTALLDIR=${datadir}/emacs/${version}/leim
+INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim
GZIP_PROG = @GZIP_PROG@
[-- Attachment #3: Type: text/plain, Size: 149 bytes --]
_______________________________________________
bug-gnu-emacs mailing list
bug-gnu-emacs@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-02-24 23:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-24 23:33 DESTDIR support patch Claudio Fontana
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.