patch-make_tmpl_in 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. --- LVM2.2.02.80.orig/make.tmpl.in 2011-01-10 14:00:53.000000000 +0100
  2. +++ LVM2.2.02.80/make.tmpl.in 2011-01-11 11:39:53.000000000 +0100
  3. @@ -33,7 +33,7 @@ LIBS = @LIBS@
  4. # Extra libraries always linked with static binaries
  5. STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS)
  6. DEFS += @DEFS@
  7. -CFLAGS += @CFLAGS@
  8. +CFLAGS = @CFLAGS@
  9. CLDFLAGS += @CLDFLAGS@
  10. LDDEPS += @LDDEPS@
  11. LDFLAGS += @LDFLAGS@
  12. @@ -322,7 +322,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI
  13. $(LN_S) -f $(<F) $@
  14. install_lib_shared: $(LIB_SHARED)
  15. - $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
  16. + $(INSTALL_DIR) $(libdir)
  17. + $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
  18. $(INSTALL_DIR) $(usrlibdir)
  19. $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
  20. @@ -330,11 +331,13 @@ install_lib_shared: $(LIB_SHARED)
  21. # and for compatibility links in libdir are created
  22. # when the code is fixed links could be removed.
  23. install_dm_plugin: $(LIB_SHARED)
  24. - $(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
  25. + $(INSTALL_DIR) $(libdir)
  26. + $(INSTALL_PROGRAM) $< $(libdir)/device-mapper/$(<F)
  27. $(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
  28. install_lvm2_plugin: $(LIB_SHARED)
  29. - $(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
  30. + $(INSTALL_DIR) $(libdir)
  31. + $(INSTALL_PROGRAM) $< $(libdir)/lvm2/$(<F)
  32. $(LN_S) -f lvm2/$(<F) $(libdir)/$(<F)
  33. $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
  34. endif