diff options
| author | wl <wl> | 2011-10-17 06:01:57 +0000 |
|---|---|---|
| committer | wl <wl> | 2011-10-17 06:01:57 +0000 |
| commit | 6e34f2c07c538ccec94ab0faa0d9111546fb5fa3 (patch) | |
| tree | 773399fdba02bffbadcf276f39c966ed508c063a | |
| parent | e60da0ca3a1bc028485d83500fdeaf74dc35f191 (diff) | |
| download | groff-6e34f2c07c538ccec94ab0faa0d9111546fb5fa3.tar.gz | |
Do not use INSTALL_DATA and INSTALL_SCRIPT during build phase.
* Makefile.sub (groffer): Replace INSTALL_DATA and
INSTALL_SCRIPT with `cp'. Otherwise the build phase might
fail with `permission denied' if you use the `-o root' flag
of the `install' command. The use of INSTALL_* is an abuse
anyway because it's not installing anything at that point;
it's just copying files around locally, within in the build
directories.
| -rw-r--r-- | contrib/groffer/ChangeLog | 12 | ||||
| -rw-r--r-- | contrib/groffer/Makefile.sub | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog index 342b0250..f996a86b 100644 --- a/contrib/groffer/ChangeLog +++ b/contrib/groffer/ChangeLog @@ -1,3 +1,15 @@ +2011-10-17 Ingo Schwarze <schwarze@openbsd.org> + + Do not use INSTALL_DATA and INSTALL_SCRIPT during build phase. + + * Makefile.sub (groffer): Replace INSTALL_DATA and + INSTALL_SCRIPT with `cp'. Otherwise the build phase might + fail with `permission denied' if you use the `-o root' flag + of the `install' command. The use of INSTALL_* is an abuse + anyway because it's not installing anything at that point; + it's just copying files around locally, within in the build + directories. + 2011-03-21 Jan Vcelak <jvcelak@redhat.com> Bernd Warken diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub index 245d9f5a..dee3a430 100644 --- a/contrib/groffer/Makefile.sub +++ b/contrib/groffer/Makefile.sub @@ -6,7 +6,7 @@ # Free Software Foundation, Inc. # Written by Werner Lemberg <wl@gnu.org> and Bernd Warken. -# Last update: 22 Mar 2011 +# Last update: 17 Oct 2011 # This file is part of `groffer' which is part of `groff'. @@ -77,9 +77,9 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ -e "s|@VERSION@|$(version)$(revision)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ $(srcdir)/perl/groffer.pl >$@; \ - $(INSTALL_DATA) $(srcdir)/perl/groffer.man groffer.man; \ + cp $(srcdir)/perl/groffer.man groffer.man; \ for f in $(ROFF2PROGS); do \ - $(INSTALL_SCRIPT) $(srcdir)/perl/roff2.pl $$f; \ + cp $(srcdir)/perl/roff2.pl $$f; \ done; \ else \ : >HAVE_SHELL; \ @@ -92,9 +92,9 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ -e "s|@VERSION@|$(version)$(revision)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ $(srcdir)/shell/groffer.sh >$@; \ - $(INSTALL_DATA) $(srcdir)/shell/groffer.man groffer.man; \ + cp $(srcdir)/shell/groffer.man groffer.man; \ for f in $(ROFF2PROGS); do \ - $(INSTALL_SCRIPT) $(srcdir)/shell/roff2.sh $$f; \ + cp $(srcdir)/shell/roff2.sh $$f; \ done; \ fi chmod +x $@ |