public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/portage:prefix commit in: pym/
@ 2012-04-27 15:53 Fabian Groffen
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2012-04-27 15:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4025638c00de5e9e21ef419a5b107141525283ca
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 15:52:08 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 15:52:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4025638c

build-sys: avoid harmless error message during install

Different way to fix #411817 by just avoiding to list a directory that
won't contain python files.

---
 pym/Makefile.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/Makefile.in b/pym/Makefile.in
index aa903bb..ce8fa39 100644
--- a/pym/Makefile.in
+++ b/pym/Makefile.in
@@ -17,7 +17,7 @@ INSTALL = @INSTALL@
 INSTALL_subst = ${top_builddir}/subst-install
 
 list_sourcedir_dirs = \
-	( cd "$(srcdir)" && find . -name '.svn' -prune -o -type d -print )
+	( cd "$(srcdir)" && find . -name '.git' -prune -o -type d -print | sed 's#^./\?##' )
 
 all:
 



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/portage:prefix commit in: pym/
@ 2012-07-08 17:00 Fabian Groffen
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2012-07-08 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2ffa184779089f60fb30f471415be4f8c841420d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 16:58:35 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 16:58:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2ffa1847

build-sys: fix installation of files

avoid using hash in the sed, the interaction of make with the shell
seems to interpret the hash somewhere, despite being quoted, resulting
in loss of half of the sed command

---
 pym/Makefile.in |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/pym/Makefile.in b/pym/Makefile.in
index ce8fa39..f9a9636 100644
--- a/pym/Makefile.in
+++ b/pym/Makefile.in
@@ -16,14 +16,11 @@ PORTAGE_PYM = @PORTAGE_BASE@/pym
 INSTALL = @INSTALL@
 INSTALL_subst = ${top_builddir}/subst-install
 
-list_sourcedir_dirs = \
-	( cd "$(srcdir)" && find . -name '.git' -prune -o -type d -print | sed 's#^./\?##' )
-
 all:
 
 install:
 	$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(PORTAGE_PYM)
-	$(list_sourcedir_dirs) | while read f ; do \
+	( cd "$(srcdir)" && find . -name '.git' -prune -o -type d -print | sed 's|^./\?||' ) | while read f ; do \
 		$(INSTALL) -d -m 755 \
 			-o "$(portageuser)" -g "$(portagegroup)" \
 			"$(DESTDIR)$(PORTAGE_PYM)/$${f}" && \



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/portage:prefix commit in: pym/
@ 2014-04-22 20:14 Fabian Groffen
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2014-04-22 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     3796fa07e461a0eb1933ccd84feba61d70f0366f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 20:14:32 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 20:14:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3796fa07

pym: install ALL files

---
 pym/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/Makefile.in b/pym/Makefile.in
index 4db3a75..c1025f6 100644
--- a/pym/Makefile.in
+++ b/pym/Makefile.in
@@ -27,7 +27,7 @@ install:
 		$(INSTALL_subst) \
 			-o "$(portageuser)" -g "$(portagegroup)" \
 			-t "$(DESTDIR)$(PORTAGE_PYM)/$${f}" \
-			"$(srcdir)/$${f}"/*.py \
+			"$(srcdir)/$${f}"/* \
 	; done
 
 .PHONY:	all install


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/portage:prefix commit in: pym/
@ 2014-04-22 20:30 Fabian Groffen
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2014-04-22 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     58f7be0fe8ba7c8419a389681a7ea22555545215
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 20:30:24 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 20:30:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=58f7be0f

pym: be more careful installing ALL files

---
 pym/Makefile.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pym/Makefile.in b/pym/Makefile.in
index c1025f6..dad4ed3 100644
--- a/pym/Makefile.in
+++ b/pym/Makefile.in
@@ -21,13 +21,19 @@ all:
 install:
 	$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(PORTAGE_PYM)
 	( cd "$(srcdir)" && find * -type d ) | while read f ; do \
+		files=( ) ; \
+		for t in "$(srcdir)/$${f}"/* ; do \
+			[[ -d $${t} ]] && continue ; \
+			[[ $${t} == */Makefile* ]] && continue ; \
+			files=( "$${files[@]}" "$${t}" ) ; \
+		done ; \
 		$(INSTALL) -d -m 755 \
 			-o "$(portageuser)" -g "$(portagegroup)" \
 			"$(DESTDIR)$(PORTAGE_PYM)/$${f}" && \
 		$(INSTALL_subst) \
 			-o "$(portageuser)" -g "$(portagegroup)" \
 			-t "$(DESTDIR)$(PORTAGE_PYM)/$${f}" \
-			"$(srcdir)/$${f}"/* \
+			"$${files[@]}" \
 	; done
 
 .PHONY:	all install


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-04-22 20:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-22 20:14 [gentoo-commits] proj/portage:prefix commit in: pym/ Fabian Groffen
  -- strict thread matches above, loose matches on Subject: below --
2014-04-22 20:30 Fabian Groffen
2012-07-08 17:00 Fabian Groffen
2012-04-27 15:53 Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox