From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Wilson Subject: Re: [PATCH] tools: honour --libdir when it is passed to ./configure Date: Wed, 20 Jun 2012 09:44:13 -0700 Message-ID: <20120620164413.GB2640@US-SEA-R8XVZTX> References: <0a592e08ac31b3934372.1340153217@kaos-source-31003.sea31.amazon.com> <4FE18F05.8030309@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <4FE18F05.8030309@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Roger Pau Monne Cc: Ian Campbell , "xen-devel@lists.xen.org" List-Id: xen-devel@lists.xenproject.org On Wed, Jun 20, 2012 at 01:51:17AM -0700, Roger Pau Monne wrote: > Matt Wilson wrote: > > Signed-off-by: Matt Wilson > > Thanks for the patch! The way FSIMAGE_FSDIR is set is really wrong. No problem. The FSIMAGE_FSDIR bit was a gross hack so I didn't have to touch autoconf, which I try to avoid. ;-) > > diff -r 32034d1914a6 -r 0a592e08ac31 config/SunOS.mk > > --- a/config/SunOS.mk Thu Jun 07 19:46:57 2012 +0100 > > +++ b/config/SunOS.mk Wed Jun 20 00:40:15 2012 +0000 > > @@ -24,7 +24,6 @@ BINDIR = $(PREFIX)/bin > > INCLUDEDIR = $(PREFIX)/include > > LIBLEAFDIR = lib > > LIBLEAFDIR_x86_64 = lib/amd64 > > -LIBDIR = $(PREFIX)/$(LIBLEAFDIR) > > LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) > > MANDIR = $(PREFIX)/share/man > > MAN1DIR = $(MANDIR)/man1 > > Can we clean this a little bit more, and remove LIBDIR_x86_32, > LIBLEAFDIR_x86_64, LIBDIR_x86_64, LIBDIR_x86_32 and LIBLEAFDIR? I was thinking that too, but was a little worried about expectations on Solaris. Maybe I souldn't. > > -CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ > > +CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" > > I would prefer to set FSIMAGE_FSDIR or an equivalent define in > tools/config.h and include that header in > tools/libfsimage/common/fsimage_plugin.h, so we don't have to pass that > value from the compiler command line. Makes sense. Matt