From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 027781381F3 for ; Wed, 18 Sep 2013 14:00:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 938B2E09B8; Wed, 18 Sep 2013 14:00:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 164DBE0A93 for ; Wed, 18 Sep 2013 14:00:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBE3333EA87 for ; Wed, 18 Sep 2013 14:00:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A598DE545E for ; Wed, 18 Sep 2013 14:00:32 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1379512745.7eb9c2a37ff93cfec565d034481c79dc21323a79.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: / X-VCS-Repository: proj/R_overlay X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 7eb9c2a37ff93cfec565d034481c79dc21323a79 X-VCS-Branch: master Date: Wed, 18 Sep 2013 14:00:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6b41e73e-0597-4c19-8760-9f08d794cfba X-Archives-Hash: 5d24ba4df7f6ef5297822bf68b0d9e61 commit: 7eb9c2a37ff93cfec565d034481c79dc21323a79 Author: André Erdmann mailerd de> AuthorDate: Wed Sep 18 13:59:05 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Sep 18 13:59:05 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7eb9c2a3 Makefile: fix generate-config --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1c18f2a..4f2c60e 100644 --- a/Makefile +++ b/Makefile @@ -98,19 +98,22 @@ generate-manifest: $(MANIFEST_GEN) mv -- $(MANIFEST_TMP) $(MANIFEST) generate-config: $(RV_SETUP) - ROVERLAY_INSTALLED=1 $(RV_SETUP) mkconfig \ + ROVERLAY_INSTALLED=1 $(RV_SETUP) \ -O config/R-overlay.conf.install \ -D $(DATADIR)/roverlay \ --conf-root $(CONFDIR)/roverlay --my-conf-root $(CONFDIR)/roverlay \ - -A $(CONFDIR)/roverlay/files + -A $(CONFDIR)/roverlay/files \ + mkconfig - ROVERLAY_INSTALLED=0 $(RV_SETUP) mkconfig \ + ROVERLAY_INSTALLED=0 $(RV_SETUP) \ -O R-overlay.conf --prjroot-relpath \ - -D files --conf-root config --my-conf-root config -A files -W workdir + -D files --conf-root config --my-conf-root config -A files -W workdir \ + mkconfig - ROVERLAY_INSTALLED=0 $(RV_SETUP) mkconfig \ - -O R-overlay.conf.local \ - -D files --conf-root config --my-conf-root config -A files -W workdir + ROVERLAY_INSTALLED=0 $(RV_SETUP) \ + -O R-overlay.conf.local.new \ + -D files --conf-root config --my-conf-root config -A files -W workdir \ + mkconfig generate-files: generate-config generate-doc generate-manifest