diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-22 14:29:11 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-22 14:29:11 +0000 |
| commit | c8107e1564b783e344be4af53dd156a452c53eee (patch) | |
| tree | b24eb9f8614374b5b166233fc89dbd1307d70bde /tools/libfsimage | |
| parent | 590e56fc113b8cbe3d4f0efe23b0690be1cb7bf1 (diff) | |
| download | xen-c8107e1564b783e344be4af53dd156a452c53eee.tar.gz xen-c8107e1564b783e344be4af53dd156a452c53eee.tar.bz2 xen-c8107e1564b783e344be4af53dd156a452c53eee.zip | |
Apply PREFIX directly to LIBDIR.
Signed-off-by: Bastian Blank <waldi@debian.org>
Diffstat (limited to 'tools/libfsimage')
| -rw-r--r-- | tools/libfsimage/Rules.mk | 4 | ||||
| -rw-r--r-- | tools/libfsimage/common/Makefile | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk index ca6380a4a1..71d59efae9 100644 --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk @@ -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 --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index 5c22fa974d..ddf1d6a145 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -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 |