diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-11-25 21:40:40 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-11-25 23:17:58 +0300 |
| commit | 74ab5db53242dfa88635d029c2bdce77a0a38f03 (patch) | |
| tree | ca7fb062ec5ff0ae6c48ef78dfb10cd758d91cc3 | |
| parent | 6cdbc23e72e07250d987b8254cc68abff7bc067f (diff) | |
| download | fakeroot-74ab5db53242dfa88635d029c2bdce77a0a38f03.tar.gz | |
Install under /usr/lib
| -rw-r--r-- | debian/libfakeroot.dirs | 1 | ||||
| -rw-r--r-- | debian/libfakeroot.install | 5 | ||||
| -rw-r--r-- | debian/libfakeroot.links.in | 7 | ||||
| -rwxr-xr-x | debian/rules | 12 |
4 files changed, 6 insertions, 19 deletions
diff --git a/debian/libfakeroot.dirs b/debian/libfakeroot.dirs deleted file mode 100644 index eff2b43..0000000 --- a/debian/libfakeroot.dirs +++ /dev/null @@ -1 +0,0 @@ -etc/ld.so.conf.d diff --git a/debian/libfakeroot.install b/debian/libfakeroot.install index b20bae7..f7c1a25 100644 --- a/debian/libfakeroot.install +++ b/debian/libfakeroot.install @@ -1,3 +1,2 @@ -/etc/ld.so.conf.d/fakeroot-*.conf -/usr/lib/*/libfakeroot/libfakeroot-sysv.so -/usr/lib/*/libfakeroot/libfakeroot-tcp.so +/usr/lib/*/libfakeroot-sysv.so +/usr/lib/*/libfakeroot-tcp.so diff --git a/debian/libfakeroot.links.in b/debian/libfakeroot.links.in deleted file mode 100644 index 608ad84..0000000 --- a/debian/libfakeroot.links.in +++ /dev/null @@ -1,7 +0,0 @@ -# Both libfakeroot-sysv.so and libfakeroot-tcp.so have a SONAME of -# libfakeroot-0.so, so this link will be created by ldconfig anyway. -# But ldconfig will not clean this up again if -# /etc/ld.so.conf.d/fakeroot-*.conf got removed first. Since the link -# is never used by fakeroot, it does not matter to which library it -# points. -@LIBDIR@/libfakeroot/libfakeroot-tcp.so @LIBDIR@/libfakeroot/libfakeroot-0.so diff --git a/debian/rules b/debian/rules index 7f1bf74..52269e7 100755 --- a/debian/rules +++ b/debian/rules @@ -21,12 +21,12 @@ dhar-stamp: obj-sysv/config.status: dhar-stamp dh_testdir mkdir obj-sysv - cd obj-sysv && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/$(LIB_DIR)/libfakeroot --program-suffix=-sysv $(CONFARGS) + cd obj-sysv && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/$(LIB_DIR) --program-suffix=-sysv $(CONFARGS) obj-tcp/config.status: dhar-stamp dh_testdir mkdir obj-tcp - cd obj-tcp && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/$(LIB_DIR)/libfakeroot --with-ipc=tcp --program-suffix=-tcp $(CONFARGS) + cd obj-tcp && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/$(LIB_DIR) --with-ipc=tcp --program-suffix=-tcp $(CONFARGS) override_dh_auto_configure: obj-sysv/config.status obj-tcp/config.status @@ -40,8 +40,6 @@ else sed 's/@FAKEROOT_SYSV_ALTPRIO@/30/;s/@FAKEROOT_TCP_ALTPRIO@/50/;' \ debian/fakeroot.postinst.in > debian/fakeroot.postinst endif - sed 's,@LIBDIR@,/$(LIB_DIR),g' \ - debian/libfakeroot.links.in > debian/libfakeroot.links override_dh_auto_test: ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) @@ -55,11 +53,9 @@ endif override_dh_auto_install: cd obj-tcp && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install - mv debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-0.so debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-tcp.so + mv debian/tmp/$(LIB_DIR)/libfakeroot-0.so debian/tmp/$(LIB_DIR)/libfakeroot-tcp.so cd obj-sysv && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install - mv debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-0.so debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-sysv.so - mkdir -p debian/tmp/etc/ld.so.conf.d - echo /$(LIB_DIR)/libfakeroot > debian/tmp/etc/ld.so.conf.d/fakeroot-$(DEB_HOST_MULTIARCH).conf + mv debian/tmp/$(LIB_DIR)/libfakeroot-0.so debian/tmp/$(LIB_DIR)/libfakeroot-sysv.so override_dh_auto_clean: rm -rf obj-sysv obj-tcp |