diff options
Diffstat (limited to 'package/lvm/patches/patch-libdm_Makefile_in')
| -rw-r--r-- | package/lvm/patches/patch-libdm_Makefile_in | 75 |
1 files changed, 33 insertions, 42 deletions
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index 52a52a0fd..9a999133b 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,60 +1,51 @@ ---- LVM2.2.02.61.orig/libdm/Makefile.in 2009-10-02 21:10:36.000000000 +0200 -+++ LVM2.2.02.61/libdm/Makefile.in 2010-03-08 06:27:03.000000000 +0100 -@@ -35,9 +35,7 @@ SOURCES =\ +--- LVM2.2.02.72.orig/libdm/Makefile.in Fri Jun 25 20:17:39 2010 ++++ LVM2.2.02.72/libdm/Makefile.in Fri Jul 30 10:34:15 2010 +@@ -34,10 +34,7 @@ SOURCES =\ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) -ifeq ("@STATIC_LINK@", "yes") LIB_STATIC = $(interface)/libdevmapper.a -endif - - ifeq ("@LIB_SUFFIX@","dylib") - LIB_SHARED = $(interface)/libdevmapper.dylib -@@ -60,9 +58,7 @@ device-mapper: all +- + LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) + LIB_VERSION = $(LIB_VERSION_DM) + TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) +@@ -65,11 +62,8 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX). + install_pkgconfig INSTALL_TYPE = install_dynamic ++INSTALL_TYPE += install_static -ifeq ("@STATIC_LINK@", "yes") - INSTALL_TYPE += install_static -endif -+INSTALL_TYPE += install_static - +- ifeq ("@PKGCONFIG@", "yes") INSTALL_TYPE += install_pkgconfig -@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include + endif +@@ -79,7 +73,8 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install - install_include: -- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ -+ $(INSTALL) -d $(includedir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ - $(includedir)/libdevmapper.h + install_include: $(srcdir)/libdevmapper.h +- $(INSTALL_DATA) -D $< $(includedir)/$(<F) ++ $(INSTALL_DIR) $(includedir) ++ $(INSTALL_DATA) $< $(includedir)/$(<F) install_dynamic: install_@interface@ -+ $(INSTALL) -d $(libdir) - $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \ - $(libdir)/libdevmapper.$(LIB_SUFFIX) - - install_static: install_@interface@_static -+ $(INSTALL) -d $(libdir) - $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a - - install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX) -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -d $(libdir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ - $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) - - install_pkgconfig: -- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \ -+ $(INSTALL) -d $(usrlibdir)/pkgconfig -+ $(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.pc \ - $(usrlibdir)/pkgconfig/devmapper.pc - - install_ioctl_static: ioctl/libdevmapper.a -- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ -+ $(INSTALL) -d $(libdir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ - $(libdir)/libdevmapper.a.$(LIB_VERSION_DM) - - $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX) + +@@ -88,10 +83,12 @@ install_static: install_@interface@_static + install_ioctl: install_lib_shared + + install_pkgconfig: libdevmapper.pc +- $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc ++ $(INSTALL_DIR) $(pkgconfigdir) ++ $(INSTALL_DATA) $< $(pkgconfigdir)/devmapper.pc + + install_ioctl_static: $(LIB_STATIC) +- $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F) ++ $(INSTALL_DIR) $(usrlibdir) ++ $(INSTALL_DATA) $< $(usrlibdir)/$(<F) + + CLEAN_TARGETS += ioctl/libdevmapper.a + DISTCLEAN_TARGETS += libdevmapper.pc |