thr3ads.net - Xen devel - [Xen-devel] [PATCH 2/6] makefiles

If this information is useful, please help other people find it:
Share via:
Bastian Blank
2008-Jan-22 13:26 UTC
[Xen-devel] [PATCH 2/6] makefiles - Apply PREFIX to LIBDIR

# HG changeset patch
# User Bastian Blank <waldi@debian.org>
# Date 1200745316 -3600
# Node ID 9def133ba3123ed99e9b007bf91d07b2d58b4262
# Parent  c5c18c78ceaeb2a983fb917163f9a0b80be384fe
Apply PREFIX directly to LIBDIR.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff -r c5c18c78ceae -r 9def133ba312 Makefile
--- a/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -188,10 +188,10 @@ uninstall:
 	rm -rf $(D)/usr/include/xenctrl.h $(D)/usr/include/xenguest.h
 	rm -rf $(D)/usr/include/xs_lib.h $(D)/usr/include/xs.h
 	rm -rf $(D)/usr/include/xen
-	rm -rf $(D)/usr/$(LIBDIR)/libxenctrl* $(D)/usr/$(LIBDIR)/libxenguest*
-	rm -rf $(D)/usr/$(LIBDIR)/libxenstore*
-	rm -rf $(D)/usr/$(LIBDIR)/python/xen $(D)/usr/$(LIBDIR)/python/grub
-	rm -rf $(D)/usr/$(LIBDIR)/xen/
+	rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
+	rm -rf $(D)$(LIBDIR)/libxenstore*
+	rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
+	rm -rf $(D)$(LIBDIR)/xen/
 	rm -rf $(D)/usr/lib/xen/
 	rm -rf $(D)/usr/local/sbin/setmask $(D)/usr/local/sbin/xen*
 	rm -rf $(D)/usr/sbin/xen* $(D)/usr/sbin/netfix $(D)/usr/sbin/xm
diff -r c5c18c78ceae -r 9def133ba312 config/StdGNU.mk
--- a/config/StdGNU.mk	Sat Jan 19 13:21:56 2008 +0100
+++ b/config/StdGNU.mk	Sat Jan 19 13:21:56 2008 +0100
@@ -18,8 +18,8 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX = /usr
-
-LIB64DIR = lib64
+LIBDIR = $(PREFIX)/lib
+LIBDIR_x86_64 = $(PREFIX)/lib64
 
 SOCKET_LIBS  CURSES_LIBS = -lncurses
diff -r c5c18c78ceae -r 9def133ba312 config/SunOS.mk
--- a/config/SunOS.mk	Sat Jan 19 13:21:56 2008 +0100
+++ b/config/SunOS.mk	Sat Jan 19 13:21:56 2008 +0100
@@ -19,14 +19,17 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX = /usr
+LIBDIR = $(PREFIX)/lib
+LIBDIR_x86_64 = $(PREFIX)/lib/amd64
 
-LIB64DIR = lib/amd64
+SunOS_LIBDIR = /usr/sfw/lib
+SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
 
 SOCKET_LIBS = -lsocket
 CURSES_LIBS = -lcurses
 UTIL_LIBS  SONAME_LDFLAG = -h
-SHLIB_CFLAGS = -R /usr/sfw/$(LIBDIR) -shared
+SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
 
 ifneq ($(debug),y)
 # Optimisation flags are overridable
diff -r c5c18c78ceae -r 9def133ba312 config/ia64.mk
--- a/config/ia64.mk	Sat Jan 19 13:21:56 2008 +0100
+++ b/config/ia64.mk	Sat Jan 19 13:21:56 2008 +0100
@@ -4,5 +4,3 @@ CONFIG_IOEMU := y
 CONFIG_IOEMU := y
 CONFIG_XCUTILS := y
 CONFIG_XENCOMM := y
-
-LIBDIR := lib
diff -r c5c18c78ceae -r 9def133ba312 config/powerpc64.mk
--- a/config/powerpc64.mk	Sat Jan 19 13:21:56 2008 +0100
+++ b/config/powerpc64.mk	Sat Jan 19 13:21:56 2008 +0100
@@ -4,4 +4,3 @@ CONFIG_XENCOMM := y
 CONFIG_XENCOMM := y
 
 CFLAGS += -DELFSIZE=64
-LIBDIR := lib
diff -r c5c18c78ceae -r 9def133ba312 config/x86_32.mk
--- a/config/x86_32.mk	Sat Jan 19 13:21:56 2008 +0100
+++ b/config/x86_32.mk	Sat Jan 19 13:21:56 2008 +0100
@@ -8,7 +8,6 @@ CONFIG_IOEMU := y
 CONFIG_IOEMU := y
 
 CFLAGS += -m32 -march=i686
-LIBDIR := lib
 
 # Use only if calling $(LD) directly.
 LDFLAGS_DIRECT_OpenBSD = _obsd
diff -r c5c18c78ceae -r 9def133ba312 config/x86_64.mk
--- a/config/x86_64.mk	Sat Jan 19 13:21:56 2008 +0100
+++ b/config/x86_64.mk	Sat Jan 19 13:21:56 2008 +0100
@@ -9,7 +9,10 @@ CONFIG_IOEMU := y
 CONFIG_IOEMU := y
 
 CFLAGS += -m64
-LIBDIR = $(LIB64DIR)
+
+LIBDIR = $(LIBDIR_x86_64)
+
+SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)
 
 # Use only if calling $(LD) directly.
 ifeq ($(XEN_OS),OpenBSD)
diff -r c5c18c78ceae -r 9def133ba312 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/blktap/lib/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -40,11 +40,11 @@ libblktap: libblktap.a
 libblktap: libblktap.a
 
 install: all
-	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	$(INSTALL_DIR) $(DESTDIR)/usr/include
-	$(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libblktap.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
-	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
+	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
+	ln -sf libblktap.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
+	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
 
 clean:
diff -r c5c18c78ceae -r 9def133ba312 tools/console/Makefile
--- a/tools/console/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/console/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 include $(XEN_ROOT)/tools/Rules.mk
 
 DAEMON_INSTALL_DIR = /usr/sbin
-CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
+CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
 
 CFLAGS  += -Werror
 
diff -r c5c18c78ceae -r 9def133ba312 tools/debugger/xenitp/Makefile
--- a/tools/debugger/xenitp/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/debugger/xenitp/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -27,14 +27,13 @@ build: $(BIN) $(LIBBIN)
 .PHONY: install
 install: build
 	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
-	[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
-		$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
 	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
 		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
 	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
 		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
 	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
-	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)/usr/$(LIBDIR)/xen/bin
+	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)$(LIBDIR)/xen/bin
 	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
 	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
 
diff -r c5c18c78ceae -r 9def133ba312 tools/flask/libflask/Makefile
--- a/tools/flask/libflask/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/flask/libflask/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -33,12 +33,12 @@ build:
 
 .PHONY: install
 install: build
-	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libflask.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
-	ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
+	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
+	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
+	ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
 	$(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
 
 .PHONY: TAGS
diff -r c5c18c78ceae -r 9def133ba312 tools/libfsimage/Rules.mk
--- a/tools/libfsimage/Rules.mk	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/libfsimage/Rules.mk	Sat Jan 19 13:21:56 2008 +0100
@@ -20,8 +20,8 @@ fs-all: $(FSLIB)
 
 .PHONY: fs-install
 fs-install: fs-all
-	$(INSTALL_DIR) $(DESTDIR)/usr/$(FSDIR)
-	$(INSTALL_PROG) $(FSLIB) $(DESTDIR)/usr/$(FSDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(FSDIR)
+	$(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR)
 
 $(FSLIB): $(PIC_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS)
diff -r c5c18c78ceae -r 9def133ba312 tools/libfsimage/common/Makefile
--- a/tools/libfsimage/common/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/libfsimage/common/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -22,11 +22,11 @@ all: $(LIB)
 
 .PHONY: install
 install: all
-	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libfsimage.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libfsimage.so.$(MAJOR)
-	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so
+	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	ln -sf libfsimage.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
+	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
 	$(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
 	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
 	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
diff -r c5c18c78ceae -r 9def133ba312 tools/libxc/Makefile
--- a/tools/libxc/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/libxc/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -103,18 +103,18 @@ check-for-zlib:
 
 .PHONY: install
 install: build
-	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libxenctrl.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
-	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
+	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
+	ln -sf libxenctrl.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
+	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
 	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
 
-	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
-	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
+	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
+	ln -sf libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
+	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
 	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
 
 .PHONY: TAGS
diff -r c5c18c78ceae -r 9def133ba312 tools/libxen/Makefile
--- a/tools/libxen/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/libxen/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -56,11 +56,11 @@ libxenapi.a: $(LIBXENAPI_OBJS)
 .PHONY: install
 install: all
 	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
-	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libxenapi.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
-	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
-	$(INSTALL_DATA) libxenapi.a $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	ln -sf libxenapi.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
+	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
+	$(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
 	set -e; for i in $(LIBXENAPI_HDRS); do \
 	    $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
 	done
diff -r c5c18c78ceae -r 9def133ba312 tools/libxen/Makefile.dist
--- a/tools/libxen/Makefile.dist	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/libxen/Makefile.dist	Sat Jan 19 13:21:56 2008 +0100
@@ -66,11 +66,11 @@ libxenapi.a: $(LIBXENAPI_OBJS)
 .PHONY: install
 install: all
 	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
-	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libxenapi.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
-	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
-	$(INSTALL_DATA) libxenapi.a $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	ln -sf libxenapi.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
+	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
+	$(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
 	set -e; for i in $(LIBXENAPI_HDRS); do \
 	    $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
 	done
diff -r c5c18c78ceae -r 9def133ba312 tools/vnet/libxutil/Makefile
--- a/tools/vnet/libxutil/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/vnet/libxutil/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -71,11 +71,11 @@ check-for-zlib:
 
 .PHONY: install
 install: build
-	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libxutil.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
-	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_DATA) libxutil.a $(DESTDIR)$(LIBDIR)
+	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxutil.so.$(MAJOR)
+	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxutil.so
 
 .PHONY: clean
 clean:
diff -r c5c18c78ceae -r 9def133ba312 tools/xcutils/Makefile
--- a/tools/xcutils/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/xcutils/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -11,7 +11,7 @@ XEN_ROOT	= ../..
 XEN_ROOT	= ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
+PROGRAMS_INSTALL_DIR = $(LIBDIR)/xen/bin
 
 INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
 
diff -r c5c18c78ceae -r 9def133ba312 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/xenstore/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -88,11 +88,11 @@ install: all
 	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
 	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
 	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
-	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
-	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
-	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	ln -sf libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
+	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
+	$(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
 	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
 
diff -r c5c18c78ceae -r 9def133ba312 tools/xentrace/Makefile
--- a/tools/xentrace/Makefile	Sat Jan 19 13:21:56 2008 +0100
+++ b/tools/xentrace/Makefile	Sat Jan 19 13:21:56 2008 +0100
@@ -36,14 +36,13 @@ build: $(BIN) $(LIBBIN)
 .PHONY: install
 install: build
 	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
-	[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
-		$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
 	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
 		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
 	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
 		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
 	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
-	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)/usr/$(LIBDIR)/xen/bin
+	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)$(LIBDIR)/xen/bin
 	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
 	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
 


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Xen devel - Jan 2008 - [PATCH 2/6] makefiles - Apply PREFIX to LIBDIR

[Xen-devel] [PATCH 2/6] makefiles - Apply PREFIX to LIBDIR
