{"thread":{"id":"4711","subject":"[PATCH 1/2] Allow INSTALL, bindir, mandir to be set in main Makefile","startedAt":"2006-06-29T20:11:25Z","lastAt":"2006-06-29T22:45:30Z","messageCount":5,"participants":["Jakub Narebski","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"22828","messageId":"200606292211.28352.jnareb@gmail.com","threadId":"4711","inReplyTo":null,"subject":"[PATCH 1/2] Allow INSTALL, bindir, mandir to be set in main Makefile","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-06-29T20:11:25Z","receivedAt":"2006-06-29T20:11:25Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Makefiles in subdirectories now use existing value of INSTALL, bindir,\nmandir if it is set, allowing those to be set in main Makefile or in\nincluded config.mak.  Main Makefile exports variables which it sets.\n\nAccidentally it renames bin to bindir in Documentation/Makefile\n(should be bindir from start, but is unused, perhaps to be removed).\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nSeries only because second patch in series depends textually on first,\neven though changes are independent.\n\n Documentation/Makefile   |    4 ++--\n Makefile                 |    2 ++\n contrib/emacs/Makefile   |    4 ++--\n contrib/git-svn/Makefile |    4 ++--\n 4 files changed, 8 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 2b0efe7..ca6b77d 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -25,8 +25,8 @@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT\n DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))\n \n prefix?=$(HOME)\n-bin=$(prefix)/bin\n-mandir=$(prefix)/man\n+bindir?=$(prefix)/bin\n+mandir?=$(prefix)/man\n man1=$(mandir)/man1\n man7=$(mandir)/man7\n # DESTDIR=\ndiff --git a/Makefile b/Makefile\nindex cde619c..b8fe669 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -100,6 +100,8 @@ template_dir = $(prefix)/share/git-core/\n GIT_PYTHON_DIR = $(prefix)/share/git-core/python\n # DESTDIR=\n \n+export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR\n+\n CC = gcc\n AR = ar\n TAR = tar\ndiff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile\nindex d3619db..350846d 100644\n--- a/contrib/emacs/Makefile\n+++ b/contrib/emacs/Makefile\n@@ -3,9 +3,9 @@ ## Build and install stuff\n EMACS = emacs\n \n ELC = git.elc vc-git.elc\n-INSTALL = install\n+INSTALL ?= install\n INSTALL_ELC = $(INSTALL) -m 644\n-prefix = $(HOME)\n+prefix ?= $(HOME)\n emacsdir = $(prefix)/share/emacs/site-lisp\n \n all: $(ELC)\ndiff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile\nindex 7c20946..1a6585e 100644\n--- a/contrib/git-svn/Makefile\n+++ b/contrib/git-svn/Makefile\n@@ -1,8 +1,8 @@\n all: git-svn\n \n prefix?=$(HOME)\n-bindir=$(prefix)/bin\n-mandir=$(prefix)/man\n+bindir?=$(prefix)/bin\n+mandir?=$(prefix)/man\n man1=$(mandir)/man1\n INSTALL?=install\n doc_conf=../../Documentation/asciidoc.conf\n-- \n1.4.0\n"},{"id":"22829","messageId":"200606292213.00726.jnareb@gmail.com","threadId":"4711","inReplyTo":"200606292211.28352.jnareb@gmail.com","subject":"[PATCH 2/2] Rename man1 and man7 variables to man1dir and man7dir","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-06-29T20:13:00Z","receivedAt":"2006-06-29T20:13:00Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"This patch renames man1 and man7 variables to man1dir and man7dir,\naccording to \"Makefile Conventions: Variables for Installation\nDirectories\" in make.info of GNU Make.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\n\nDepends on the earlier patch in \"series\" only via context\n\n Documentation/Makefile   |   10 +++++-----\n contrib/git-svn/Makefile |    4 ++--\n 2 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex ca6b77d..cc83610 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -27,8 +27,8 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT\n prefix?=$(HOME)\n bindir?=$(prefix)/bin\n mandir?=$(prefix)/man\n-man1=$(mandir)/man1\n-man7=$(mandir)/man7\n+man1dir=$(mandir)/man1\n+man7dir=$(mandir)/man7\n # DESTDIR=\n \n INSTALL?=install\n@@ -52,9 +52,9 @@ man1: $(DOC_MAN1)\n man7: $(DOC_MAN7)\n \n install: man\n-\t$(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7)\n-\t$(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1)\n-\t$(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7)\n+\t$(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)\n+\t$(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir)\n+\t$(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir)\n \n \n #\ndiff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile\nindex 1a6585e..8cac688 100644\n--- a/contrib/git-svn/Makefile\n+++ b/contrib/git-svn/Makefile\n@@ -3,7 +3,7 @@ all: git-svn\n prefix?=$(HOME)\n bindir?=$(prefix)/bin\n mandir?=$(prefix)/man\n-man1=$(mandir)/man1\n+man1dir=$(mandir)/man1\n INSTALL?=install\n doc_conf=../../Documentation/asciidoc.conf\n -include ../../config.mak\n@@ -17,7 +17,7 @@ install: all\n \t$(INSTALL) git-svn $(DESTDIR)$(bindir)\n \n install-doc: doc\n-\t$(INSTALL) git-svn.1 $(DESTDIR)$(man1)\n+\t$(INSTALL) git-svn.1 $(DESTDIR)$(man1dir)\n \n doc: git-svn.1\n git-svn.1 : git-svn.xml\n-- \n1.4.0\n"},{"id":"22831","messageId":"7v1wt7ra1h.fsf@assigned-by-dhcp.cox.net","threadId":"4711","inReplyTo":"200606292213.00726.jnareb@gmail.com","subject":"Re: [PATCH 2/2] Rename man1 and man7 variables to man1dir and man7dir","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-29T20:17:46Z","receivedAt":"2006-06-29T20:17:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Doesn't this break \"make dist-doc\" by _REMOVING_ make variables\nman1 and man7, which I mentioned earlier?\n"},{"id":"22839","messageId":"e81gim$cf7$1@sea.gmane.org","threadId":"4711","inReplyTo":"7v1wt7ra1h.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH 2/2] Rename man1 and man7 variables to man1dir and man7dir","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-06-29T21:26:54Z","receivedAt":"2006-06-29T21:26:54Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"This patch renames man1 and man7 variables to man1dir and man7dir,\naccording to \"Makefile Conventions: Variables for Installation\nDirectories\" in make.info of GNU Make.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\n\nJunio C Hamano wrote:\n\n> Doesn't this break \"make dist-doc\" by _REMOVING_ make variables\n> man1 and man7, which I mentioned earlier?\n\nThis is corrected patch. I think I catched all occurences, but I cannot\ndo 'make dist-doc' because I haven't got asciidoc installed.\n\nCould some kind soul check changes introduced by this patch, please?\n\n\nP.S. This patch is sent from newsreader, not mail program. I hope\nit doesn't mangle whitespaces in patch.\n\n Documentation/Makefile   |   10 +++++-----\n Makefile                 |    4 ++--\n contrib/git-svn/Makefile |    4 ++--\n 3 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex ca6b77d..cc83610 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -27,8 +27,8 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT\n prefix?=$(HOME)\n bindir?=$(prefix)/bin\n mandir?=$(prefix)/man\n-man1=$(mandir)/man1\n-man7=$(mandir)/man7\n+man1dir=$(mandir)/man1\n+man7dir=$(mandir)/man7\n # DESTDIR=\n \n INSTALL?=install\n@@ -52,9 +52,9 @@ man1: $(DOC_MAN1)\n man7: $(DOC_MAN7)\n \n install: man\n-       $(INSTALL) -d -m755 $(DESTDIR)$(man1) $(DESTDIR)$(man7)\n-       $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1)\n-       $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7)\n+       $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)\n+       $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir)\n+       $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir)\n \n \n #\ndiff --git a/Makefile b/Makefile\nindex b8fe669..ccd7c62 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -714,8 +714,8 @@ dist-doc:\n        rm -fr .doc-tmp-dir\n        mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7\n        $(MAKE) -C Documentation DESTDIR=./ \\\n-               man1=../.doc-tmp-dir/man1 \\\n-               man7=../.doc-tmp-dir/man7 \\\n+               man1dir=../.doc-tmp-dir/man1 \\\n+               man7dir=../.doc-tmp-dir/man7 \\\n                install\n        cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .\n        gzip -n -9 -f $(manpages).tar\ndiff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile\nindex 1a6585e..8cac688 100644\n--- a/contrib/git-svn/Makefile\n+++ b/contrib/git-svn/Makefile\n@@ -3,7 +3,7 @@ all: git-svn\n prefix?=$(HOME)\n bindir?=$(prefix)/bin\n mandir?=$(prefix)/man\n-man1=$(mandir)/man1\n+man1dir=$(mandir)/man1\n INSTALL?=install\n doc_conf=../../Documentation/asciidoc.conf\n -include ../../config.mak\n@@ -17,7 +17,7 @@ install: all\n        $(INSTALL) git-svn $(DESTDIR)$(bindir)\n \n install-doc: doc\n-       $(INSTALL) git-svn.1 $(DESTDIR)$(man1)\n+       $(INSTALL) git-svn.1 $(DESTDIR)$(man1dir)\n \n doc: git-svn.1\n git-svn.1 : git-svn.xml\n-- \n1.4.0\n"},{"id":"22856","messageId":"7vac7voa2d.fsf@assigned-by-dhcp.cox.net","threadId":"4711","inReplyTo":"e81gim$cf7$1@sea.gmane.org","subject":"Re: [PATCH 2/2] Rename man1 and man7 variables to man1dir and man7dir","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-29T22:45:30Z","receivedAt":"2006-06-29T22:45:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n> This is corrected patch. I think I catched all occurences, but I cannot\n> do 'make dist-doc' because I haven't got asciidoc installed.\n>\n> Could some kind soul check changes introduced by this patch, please?\n\nThanks.  Will do.\n"}]}