From patchwork Fri Jan 10 16:20:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 309332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CC7EE2C009A for ; Sat, 11 Jan 2014 03:20:47 +1100 (EST) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id s0AGKhEP001015 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 10 Jan 2014 16:20:44 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s0AGKhi2027138 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 10 Jan 2014 16:20:43 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1W1ep9-00048t-9z; Fri, 10 Jan 2014 08:20:43 -0800 Received: from ucsinet21.oracle.com ([156.151.31.93]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1W1eoo-00047Y-E8 for fedfs-utils-devel@oss.oracle.com; Fri, 10 Jan 2014 08:20:22 -0800 Received: from userp1030.oracle.com (userp1030.oracle.com [156.151.31.80]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s0AGKLxU007719 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 10 Jan 2014 16:20:22 GMT Received: from mail-ie0-f176.google.com (mail-ie0-f176.google.com [209.85.223.176]) by userp1030.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id s0AGKKQR030101 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Fri, 10 Jan 2014 16:20:21 GMT Received: by mail-ie0-f176.google.com with SMTP id at1so5357633iec.21 for ; Fri, 10 Jan 2014 08:20:20 -0800 (PST) X-Received: by 10.43.161.2 with SMTP id me2mr8923447icc.20.1389370820364; Fri, 10 Jan 2014 08:20:20 -0800 (PST) Received: from seurat.1015granger.net (c-68-40-85-241.hsd1.mi.comcast.net. [68.40.85.241]) by mx.google.com with ESMTPSA id k6sm3260309igx.8.2014.01.10.08.20.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jan 2014 08:20:19 -0800 (PST) To: fedfs-utils-devel@oss.oracle.com From: Chuck Lever Date: Fri, 10 Jan 2014 11:20:18 -0500 Message-ID: <20140110162018.32524.54065.stgit@seurat.1015granger.net> In-Reply-To: <20140110161428.32524.47303.stgit@seurat.1015granger.net> References: <20140110161428.32524.47303.stgit@seurat.1015granger.net> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Flow-Control-Info: class=Pass-to-MM reputation=ipRisk-All ip=209.85.223.176 ct-class=R5 ct-vol1=0 ct-vol2=8 ct-vol3=8 ct-risk=47 ct-spam1=75 ct-spam2=8 ct-bulk=6 rcpts=1 size=4204 X-Sendmail-CM-Score: 0.00% X-Sendmail-CM-Analysis: v=2.1 cv=dtviVTQ4 c=1 sm=1 tr=0 a=nV8NoSP4IyOTV/bQfbQ6VA==:117 a=f4GS5uou6mMssVkgzQWOAg==:17 a=dzsqy3y4QnMA:10 a=Y_Qok6OUp1kA:10 a=dPGociXpb70A:10 a=IkcTkHD0fZMA:10 a=yPCof4ZbAAAA:8 a=Lb1rMZzfAAAA:8 a=1XWaLZrsAAAA:8 a=C_IRinGWAAAA:8 a=5U gTaC8m-xUA:10 a=InZTdoKAooyxmFOd2VAA:9 a=QEXdDO2ut3YA:10 a=7DSvI1NPTFQA:10 X-Sendmail-CT-Classification: not spam X-Sendmail-CT-RefID: str=0001.0A090207.52D01DC5.00F1, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 Subject: [fedfs-utils] [PATCH 10/11] Have ./configure do variable substitution in Python scripts X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet21.oracle.com [141.146.126.237] Clean up the Makefile in src/domainroot and src/jumpstart, removing open-coded text substitution logic from the makefiles. Signed-off-by: Chuck Lever --- configure.ac | 2 ++ src/domainroot/Makefile.am | 11 +---------- src/domainroot/fedfs-domainroot.in | 4 ++-- src/jumpstart/Makefile.am | 11 +---------- src/jumpstart/nsdb-jumpstart.in | 4 ++-- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index 1120ff7..65f90d6 100644 --- a/configure.ac +++ b/configure.ac @@ -226,10 +226,12 @@ AC_CONFIG_FILES([Makefile doc/man/rpc.fedfsd.8 doc/rpcl/Makefile src/Makefile + src/domainroot/fedfs-domainroot src/domainroot/Makefile src/fedfsc/Makefile src/fedfsd/Makefile src/include/Makefile + src/jumpstart/nsdb-jumpstart src/jumpstart/Makefile src/libadmin/Makefile src/libjunction/Makefile diff --git a/src/domainroot/Makefile.am b/src/domainroot/Makefile.am index 26a3c2e..bae6645 100644 --- a/src/domainroot/Makefile.am +++ b/src/domainroot/Makefile.am @@ -27,14 +27,5 @@ bin_SCRIPTS = fedfs-domainroot EXTRA_DIST = fedfs-domainroot.in -do_substitution = $(SED) -e 's,[@]pythondir[@],$(pythondir),g' \ - -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ - -e 's,[@]VERSION[@],$(VERSION),g' \ - -e 's,[@]STATEDIR[@],$(statedir),g' - -fedfs-domainroot: fedfs-domainroot.in Makefile - $(do_substitution) < $(srcdir)/fedfs-domainroot.in > fedfs-domainroot - chmod +x fedfs-domainroot - -CLEANFILES = $(bin_SCRIPTS) cscope.in.out cscope.out cscope.po.out *~ +CLEANFILES = cscope.in.out cscope.out cscope.po.out *~ DISTCLEANFILES = Makefile.in diff --git a/src/domainroot/fedfs-domainroot.in b/src/domainroot/fedfs-domainroot.in index e8878de..6db32eb 100644 --- a/src/domainroot/fedfs-domainroot.in +++ b/src/domainroot/fedfs-domainroot.in @@ -68,8 +68,8 @@ There is NO WARRANTY, to the extent permitted by law.''') help='Display less output', action='store_true') parser.add_argument('--statedir', - help='FedFS state dir (default @STATEDIR@)', - default='@STATEDIR@') + help='FedFS state dir (default @statedir@)', + default='@statedir@') subparsers = parser.add_subparsers(title='Sub-commands') add_parser = subparsers.add_parser('add', diff --git a/src/jumpstart/Makefile.am b/src/jumpstart/Makefile.am index 0c5723b..26b5891 100644 --- a/src/jumpstart/Makefile.am +++ b/src/jumpstart/Makefile.am @@ -27,14 +27,5 @@ bin_SCRIPTS = nsdb-jumpstart EXTRA_DIST = nsdb-jumpstart.in -do_substitution = $(SED) -e 's,[@]pythondir[@],$(pythondir),g' \ - -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ - -e 's,[@]VERSION[@],$(VERSION),g' \ - -e 's,[@]STATEDIR[@],$(statedir),g' - -nsdb-jumpstart: nsdb-jumpstart.in Makefile - $(do_substitution) < $(srcdir)/nsdb-jumpstart.in > nsdb-jumpstart - chmod +x nsdb-jumpstart - -CLEANFILES = $(bin_SCRIPTS) cscope.in.out cscope.out cscope.po.out *~ +CLEANFILES = cscope.in.out cscope.out cscope.po.out *~ DISTCLEANFILES = Makefile.in diff --git a/src/jumpstart/nsdb-jumpstart.in b/src/jumpstart/nsdb-jumpstart.in index fb5b058..345c553 100644 --- a/src/jumpstart/nsdb-jumpstart.in +++ b/src/jumpstart/nsdb-jumpstart.in @@ -65,8 +65,8 @@ There is NO WARRANTY, to the extent permitted by law.''') action='version', version='@PACKAGE@ @VERSION@') parser.add_argument('--statedir', - help='FedFS state dir (default @STATEDIR@)', - default='@STATEDIR@') + help='FedFS state dir (default @statedir@)', + default='@statedir@') subparsers = parser.add_subparsers(title='Sub-commands') install_parser = subparsers.add_parser('install',