From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.bugs Subject: bug#12011: Makefile.in: allow installation of $(FULLEMACS) without linking to $(EMACS) Date: Sun, 19 Aug 2012 18:29:37 +0200 Organization: Linux Private Site Message-ID: <871uj2c0b2.fsf@Rainer.invalid> References: <87vchh3t9n.fsf@Rainer.invalid> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1345393861 23643 80.91.229.3 (19 Aug 2012 16:31:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 19 Aug 2012 16:31:01 +0000 (UTC) To: 12011@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Aug 19 18:31:01 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1T38Oy-0001l8-R1 for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Aug 2012 18:31:01 +0200 Original-Received: from localhost ([::1]:52008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T38Ox-000745-Hw for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Aug 2012 12:30:59 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T38Ou-00073z-2r for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2012 12:30:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T38Os-0004mY-C8 for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2012 12:30:56 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T38Os-0004mU-8b for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2012 12:30:54 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1T38P0-0002hU-H9 for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2012 12:31:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87vchh3t9n.fsf@Rainer.invalid> Resent-From: Achim Gratz Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Aug 2012 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12011 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.134539382110336 (code B ref -1); Sun, 19 Aug 2012 16:31:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 19 Aug 2012 16:30:21 +0000 Original-Received: from localhost ([127.0.0.1]:38733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T38OL-0002ge-2A for submit@debbugs.gnu.org; Sun, 19 Aug 2012 12:30:21 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43840) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T38OJ-0002gX-0F for submit@debbugs.gnu.org; Sun, 19 Aug 2012 12:30:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T38O8-0004BY-MS for submit@debbugs.gnu.org; Sun, 19 Aug 2012 12:30:10 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:33350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T38O8-0004BS-In for submit@debbugs.gnu.org; Sun, 19 Aug 2012 12:30:08 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T38O7-00071Y-8s for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2012 12:30:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T38O5-00045H-8r for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2012 12:30:07 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:44491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T38O4-0003yD-Rd for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2012 12:30:05 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1T38Nx-0000h4-0V for bug-gnu-emacs@gnu.org; Sun, 19 Aug 2012 18:29:57 +0200 Original-Received: from pd9eb34c0.dip.t-dialin.net ([217.235.52.192]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 19 Aug 2012 18:29:57 +0200 Original-Received: from Stromeko by pd9eb34c0.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 19 Aug 2012 18:29:57 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 149 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb34c0.dip.t-dialin.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) Cancel-Lock: sha1:8WUWyFbSdZP2uAppNk0z00lZFLc= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:63293 Archived-At: --=-=-= Content-Type: text/plain Achim Gratz writes: > Two patches to Makefile.in (one for trunk and the other for emacs-24) > are attached that implement the above suggestion. Feel free to give > those targets better names. Corrected a typo in one patch and re-generated them on top of the current branch heads. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-trunk.patch Content-Description: patch for trunk >From 79955315ebc7aeca6b7a1dc560afb4c0d3031952 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 21 Jul 2012 09:23:05 +0200 Subject: [PATCH] allow to install only the full emacs binary --- Makefile.in | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index ab9f16c..fe1ba44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -405,7 +405,12 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) ## don't have to duplicate the list of utilities to install in ## this Makefile as well. -install: all install-arch-indep install-doc install-arch-dep blessmail +.PHONY: install install-full-only install-full-link + +install-full-only: all install-arch-indep install-doc install-arch-dep blessmail + @true + +install: install-full-only install-full-link @true ## Ensure that $subdir contains a subdirs.el file. @@ -436,14 +441,21 @@ install-arch-dep: install-arch-indep install-doc if test "${ns_self_contained}" = "no"; then \ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \ - rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ - ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \ + true ; \ else \ subdir=${ns_appresdir}/site-lisp; \ ${write_subdir} || exit 1; \ rm -rf ${ns_appresdir}/share; \ fi +install-full-link: install-arch-indep install-doc + if test "${ns_self_contained}" = "no"; then \ + rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ + ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \ + else \ + true ; \ + fi + ## In the share directory, we are deleting: ## applications (with emacs.desktop, also found in etc/) ## emacs (basically empty except for unneeded site-lisp directories) -- 1.7.11.4 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-emacs24.patch Content-Description: patch for emacs24 >From b76aa8289bf563175d5ead21269c3f93778ff74a Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 21 Jul 2012 08:48:24 +0200 Subject: [PATCH] allow to install only the full emacs binary --- Makefile.in | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9a9be4f..d07784b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -449,7 +449,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) ## On AIX, use tar xBf. ## On Xenix, use tar xpf. -.PHONY: install mkdir +.PHONY: install install-full-only install-full-link mkdir ## We delete each directory in ${COPYDESTS} before we copy into it; ## that way, we can reinstall over directories that have been put in @@ -458,7 +458,10 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) ## source exists and is distinct from the destination. ### We do install-arch-indep first because ### the executable needs the Lisp files and DOC file to work properly. -install: all install-arch-indep install-arch-dep install-leim blessmail +install-full-only: all install-arch-indep install-arch-dep install-leim blessmail + @true + +install: install-full-only install-full-link @true MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done @@ -474,8 +477,6 @@ install-arch-dep: mkdir INSTALL_STRIP=${INSTALL_STRIP}) ${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) if test "${ns_appresdir}" != ""; then \ ( cd ${ns_appresdir} ; \ if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ @@ -487,6 +488,10 @@ install-arch-dep: mkdir ln -sf ../libexec/* . ; fi ; fi ) ; \ else true ; fi +install-full-link: + rm -f $(DESTDIR)${bindir}/$(EMACS) + -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) + ## FIXME is the emacs-24* bit above really necessary and correct? ## What if I have 24.1 and 24.2 installed at the same time? ## In any case, it should use something like echo $version | sed 's/\..*//' -- 1.7.11.4 --=-=-= Content-Type: text/plain Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Samples for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra --=-=-=--