From 044ff7d8ad38a42037de4abe643769e9dcbc79a8 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 22 May 2016 12:19:41 +0200 Subject: [PATCH] Debian pkg: patch for DESTDIR support. --- debian/libzakcgi.install | 1 + debian/patches/0001-DESTDIR-support.patch | 32 +++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 34 insertions(+) create mode 100644 debian/patches/0001-DESTDIR-support.patch create mode 100644 debian/patches/series diff --git a/debian/libzakcgi.install b/debian/libzakcgi.install index 3ddde58..ecc1988 100644 --- a/debian/libzakcgi.install +++ b/debian/libzakcgi.install @@ -1 +1,2 @@ usr/lib/*/lib*.so.* +usr/lib/*/libzakform/modules/* diff --git a/debian/patches/0001-DESTDIR-support.patch b/debian/patches/0001-DESTDIR-support.patch new file mode 100644 index 0000000..2e41ec1 --- /dev/null +++ b/debian/patches/0001-DESTDIR-support.patch @@ -0,0 +1,32 @@ +From: Andrea Zagli +Date: Sun, 22 May 2016 11:09:20 +0200 +Subject: DESTDIR support. + +--- + src/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 51b4a6a..d309397 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,7 @@ libmodulesext = .so + libmodulesdir = $(libdir) + endif + +-libzakformmodulesdir = `pkg-config --variable=modulesdir libzakform` ++libzakformmodulesdir = $(DESTDIR)`pkg-config --variable=modulesdir libzakform` + + LIBS = $(ZAKCGI_LIBS) + +@@ -56,8 +56,8 @@ libzakcgi_include_HEADERS = \ + libzakcgi_includedir = $(includedir)/libzakcgi + + install-exec-hook: +- cd $(libzakformmodulesdir) && \ +- ln -s -f $(libmodulesdir)/libzakcgi$(libmodulesext) . ++ mkdir -p $(libzakformmodulesdir) ++ ln -s -f -t $(libzakformmodulesdir) $(libmodulesdir)/libzakcgi$(libmodulesext) + + uninstall-hook: + rm -f $(libzakformmodulesdir)/libzakcgi$(libmodulesext) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c779459 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-DESTDIR-support.patch -- 2.49.0