← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lvm2/quantal

« back to all changes in this revision

Viewing changes to debian/patches/install.patch

  • Committer: Steve Langasek
  • Date: 2012-04-14 02:57:53 UTC
  • mfrom: (3.1.22 sid)
  • Revision ID: steve.langasek@canonical.com-20120414025753-ejbdw9c8llik58y9
https://launchpad.net/bugs/726677
Merge version 2.02.88-2 from Debian testing

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/install.patch
1
1
--- a/make.tmpl.in
2
2
+++ b/make.tmpl.in
3
 
@@ -21,6 +21,7 @@
 
3
@@ -20,6 +20,7 @@
 
4
 CC ?= @CC@
4
5
 RANLIB = @RANLIB@
5
 
 SHELL = /bin/sh
6
6
 INSTALL = @INSTALL@
7
7
+INSTALL_DATA = @INSTALL@ -m 644
8
8
 MKDIR_P = @MKDIR_P@
9
9
 MSGFMT = @MSGFMT@
10
10
 LCOV = @LCOV@
11
 
@@ -88,22 +89,14 @@
 
11
@@ -68,8 +69,7 @@
 
12
 systemd_dir = $(DESTDIR)/lib/systemd/system
 
13
 ocf_scriptdir = $(DESTDIR)@OCFDIR@
 
14
 
 
15
-USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
 
16
-  $(AWK) -f $(top_srcdir)/scripts/relpath.awk)
 
17
+USRLIB_RELPATH = @libdir@/
 
18
 
 
19
 DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@
 
20
 DEFAULT_ARCHIVE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_ARCHIVE_SUBDIR@
 
21
@@ -93,22 +93,14 @@
12
22
 endif
13
23
 
14
24
 # Handle installation of files
35
45
 
36
46
 .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
37
47
 
38
 
@@ -313,7 +306,7 @@
39
 
 install_lib_shared: $(LIB_SHARED)
40
 
        $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
41
 
        $(INSTALL) -d $(usrlibdir)
42
 
-       $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
43
 
+       $(LN_S) -f @libdir@/$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
44
 
 
45
 
 # FIXME: plugins are installed to subdirs 
46
 
 #        and for compatibility links in libdir are created