xfs
[Top] [All Lists]

[PATCH V2] fix up xfs-cmds build after the parallel-fest

To: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Subject: [PATCH V2] fix up xfs-cmds build after the parallel-fest
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Sat, 06 Dec 2008 07:38:10 -0600
Cc: xfs mailing list <xfs@xxxxxxxxxxx>
In-reply-to: <20081206102415.GA28776@xxxxxxxxxxxxx>
References: <49396528.1090700@xxxxxxxxxxx> <20081205173716.GA8216@xxxxxxxxxxxxx> <20081206102415.GA28776@xxxxxxxxxxxxx>
User-agent: Thunderbird 2.0.0.18 (Macintosh/20081105)
Christoph Hellwig wrote:

> On Fri, Dec 05, 2008 at 12:37:16PM -0500, Christoph Hellwig wrote:
>   
>> Thanks, this fixes the dpkg build for me.
>>     
>
> But it misses one hunk to fix the attr build, too:
>   
Grr, quilt is nice exept for that pesky quilt add step.  :)

================================================================

My big parallel build patch lost the "make configure" target.
This broke Makepkgs...

Now, IMHO, running configure from make is a little bass-ackwards;
I'd probably prefer to have Makepkgs explicitly run:

 autoconf; configure --myoptions; make

but for now, this adds back in a workable "make configure" target.
This time, for attr as well!

Also fixed "make install-lib" for acl, which was failing
in the man subdir.

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
---

Index: xfs-cmds/acl/Makefile
===================================================================
--- xfs-cmds.orig/acl/Makefile  2008-12-05 10:42:40.000000000 -0600
+++ xfs-cmds/acl/Makefile       2008-12-05 10:46:04.977513746 -0600
@@ -38,7 +38,7 @@ else
 clean: # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
        autoconf
        ./configure \
                --prefix=/ \
Index: xfs-cmds/acl/man/Makefile
===================================================================
--- xfs-cmds.orig/acl/man/Makefile      2008-12-05 10:42:40.000000000 -0600
+++ xfs-cmds/acl/man/Makefile   2008-12-05 10:48:20.842513303 -0600
@@ -13,10 +13,15 @@ install : $(addsuffix -install,$(SUBDIRS
 
 install-dev : $(addsuffix -install-dev,$(SUBDIRS))
 
+install-lib: $(addsuffix -install-lib,$(SUBDIRS))
+
 %-install:
        $(MAKE) -C $* install
 
 %-install-dev:
        $(MAKE) -C $* install-dev
 
+%-install-lib:
+       $(MAKE) -C $* install-lib
+
 include $(BUILDRULES)
Index: xfs-cmds/attr/Makefile
===================================================================
--- xfs-cmds.orig/attr/Makefile 2008-12-06 07:35:37.000000000 -0600
+++ xfs-cmds/attr/Makefile      2008-12-06 07:35:46.973512932 -0600
@@ -39,7 +39,7 @@ else
 clean: # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
        autoconf
        ./configure \
                --prefix=/ \
Index: xfs-cmds/dmapi/Makefile
===================================================================
--- xfs-cmds.orig/dmapi/Makefile        2008-12-06 07:35:27.500512631 -0600
+++ xfs-cmds/dmapi/Makefile     2008-12-06 07:35:51.122575385 -0600
@@ -36,7 +36,7 @@ else
 clean: # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
        autoconf
        ./configure \
                --prefix=/ \
Index: xfs-cmds/xfsprogs/Makefile
===================================================================
--- xfs-cmds.orig/xfsprogs/Makefile     2008-12-06 07:35:25.450513137 -0600
+++ xfs-cmds/xfsprogs/Makefile  2008-12-06 07:35:52.019575218 -0600
@@ -44,7 +44,7 @@ else
 clean: # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
        autoconf
        ./configure \
                --prefix=/ \
Index: xfs-cmds/xfsdump/Makefile
===================================================================
--- xfs-cmds.orig/xfsdump/Makefile      2008-12-06 07:35:23.576512995 -0600
+++ xfs-cmds/xfsdump/Makefile   2008-12-06 07:35:52.598575866 -0600
@@ -37,7 +37,7 @@ else
 clean: # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
        autoconf
        ./configure \
                --prefix=/ \
Index: xfs-cmds/nfs4acl/Makefile
===================================================================
--- xfs-cmds.orig/nfs4acl/Makefile      2008-12-06 07:35:21.142512675 -0600
+++ xfs-cmds/nfs4acl/Makefile   2008-12-06 07:35:53.473513505 -0600
@@ -39,7 +39,7 @@ else
 clean: # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
        autoconf
        ./configure \
                --prefix=/ \
Index: xfs-cmds/xfstests/Makefile
===================================================================
--- xfs-cmds.orig/xfstests/Makefile     2008-12-06 07:35:21.141513154 -0600
+++ xfs-cmds/xfstests/Makefile  2008-12-06 07:35:53.473513505 -0600
@@ -42,7 +42,7 @@ else
 clean:  # if configure hasn't run, nothing to clean
 endif
 
-include/builddefs:
+configure include/builddefs:
        autoheader
        autoconf
        ./configure \

<Prev in Thread] Current Thread [Next in Thread>