From: Eric Sandeen <sandeen@sandeen.net>
To: Christoph Hellwig <hch@infradead.org>
Cc: xfs mailing list <xfs@oss.sgi.com>
Subject: [PATCH V2] fix up xfs-cmds build after the parallel-fest
Date: Sat, 06 Dec 2008 07:38:10 -0600 [thread overview]
Message-ID: <493A8042.60700@sandeen.net> (raw)
In-Reply-To: <20081206102415.GA28776@infradead.org>
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@sandeen.net>
---
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 \
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2008-12-06 13:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-05 17:30 [PATCH] fix up xfs-cmds build after the parallel-fest Eric Sandeen
2008-12-05 17:37 ` Christoph Hellwig
2008-12-06 10:24 ` Christoph Hellwig
2008-12-06 13:38 ` Eric Sandeen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=493A8042.60700@sandeen.net \
--to=sandeen@sandeen.net \
--cc=hch@infradead.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.