From 80e0e72a2b0441b07a6a6e301991700f25f11f91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 18 Jun 2012 06:31:55 +0000 Subject: [PATCH] Fix documentation packaging. --- emi.canl.canl-c/Makefile | 4 ++-- emi.canl.canl-c/project/debian.canl.doc-base | 2 +- emi.canl.canl-c/project/debian.libcanl-c-dev.dirs | 2 +- emi.canl.canl-c/project/debian.rules | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/emi.canl.canl-c/Makefile b/emi.canl.canl-c/Makefile index bb9e95a..23e24ee 100644 --- a/emi.canl.canl-c/Makefile +++ b/emi.canl.canl-c/Makefile @@ -145,7 +145,7 @@ install: all mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} mkdir -p ${DESTDIR}${PREFIX}${prefix}/include - mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-${module.version} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-c-${module.version} ${INSTALL} -m 755 server ${DESTDIR}${PREFIX}${prefix}/bin/emi-canl-server ${INSTALL} -m 755 client ${DESTDIR}${PREFIX}${prefix}/bin/emi-canl-client ${INSTALL} -m 755 proxy \ @@ -156,7 +156,7 @@ install: all ${INSTALL} -m 644 ${top_srcdir}/src/canl.h \ ${top_srcdir}/src/canl_ssl.h canl_err.h \ ${DESTDIR}${PREFIX}${prefix}/include - ${INSTALL} -m 644 canl.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-${module.version} + ${INSTALL} -m 644 canl.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-c-${module.version} stage: all $(MAKE) install PREFIX=${stagedir} diff --git a/emi.canl.canl-c/project/debian.canl.doc-base b/emi.canl.canl-c/project/debian.canl.doc-base index edbd295..4cc8006 100644 --- a/emi.canl.canl-c/project/debian.canl.doc-base +++ b/emi.canl.canl-c/project/debian.canl.doc-base @@ -4,4 +4,4 @@ Abstract: CaNl Developer’s Guide explains how to use the Common Authentication Section: Programming/C Format: PDF -Files: /usr/share/doc/canl/canl.pdf.gz +Files: /usr/share/doc/canl-c/canl.pdf.gz diff --git a/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs b/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs index 32562c6..8fdf2ee 100644 --- a/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs +++ b/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs @@ -1,3 +1,3 @@ usr/include usr/lib -usr/share/doc/canl-doc +usr/share/doc/canl-c diff --git a/emi.canl.canl-c/project/debian.rules b/emi.canl.canl-c/project/debian.rules index 162aae5..c8abd81 100644 --- a/emi.canl.canl-c/project/debian.rules +++ b/emi.canl.canl-c/project/debian.rules @@ -39,8 +39,8 @@ install: build-stamp rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH' - mv $(CURDIR)/debian/tmp/usr/share/doc/canl-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/canl - (cd $(CURDIR)/debian/tmp/usr/share/doc/canl; \ + mv $(CURDIR)/debian/tmp/usr/share/doc/canl-c-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/canl-c + (cd $(CURDIR)/debian/tmp/usr/share/doc/canl-c; \ rm -fv ChangeLog LICENSE; \ cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz) -- 1.8.2.3