From 45b48d8dccc2c165404dd4f462339f0566d8cf4b Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 22 Jul 2017 22:32:18 +0200 Subject: [PATCH] Debian: The build system is packaged as a part of libucw-dev Previously, I added UCW::Configure to libucw-perl, but I forgot that most users of this module also need the build system. Surprisingly, our packaging completely avoided the build system files. Therefore, I moved UCW::Configure to libucw-dev and added the build system there, too. In the long term, we should move UCW::Configure under build/. Since nobody is using v6.5.3 yet, I am rebuilding it with these changes applied. --- debian/control.in | 6 +++--- debian/rules | 2 +- ucw/perl/UCW/Configure/Makefile | 6 +++++- ucw/perl/UCW/Makefile | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/control.in b/debian/control.in index 28c16fce..0d17239d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,8 +19,8 @@ Description: LibUCW library Package: libucw-dev Section: libdevel Architecture: any -Depends: libucw@UCW_ABI_SUFFIX@ (= @VER@), libucw-perl, ${shlibs:Depends}, ${misc:Depends} -Description: LibUCW development files +Depends: libucw@UCW_ABI_SUFFIX@ (= @VER@), ${shlibs:Depends}, ${misc:Depends} +Description: LibUCW development files, including the build system Package: libucw-utils Section: misc @@ -32,7 +32,7 @@ Package: libucw-perl Section: misc Architecture: any Depends: libucw@UCW_ABI_SUFFIX@, ${shlib:Depends}, ${misc:Depends} -Description: Companion Perl scripts for LibUCW (UCW::Configure, UCW::CGI, UCW::Config, UCW::Log) +Description: Companion Perl modules for LibUCW (UCW::CGI, UCW::Config, UCW::Log) #ifdef CONFIG_DOC Package: libucw-doc diff --git a/debian/rules b/debian/rules index 84a4e8a1..99e8cf97 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,7 @@ install: build dh_clean -k dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/libucw$(UCW_ABI_SUFFIX) install-libucw-lib - $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-dev install-libucw-api + $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-dev install-libucw-api install-perl-ucw-configure install-build $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-utils install-ucw-shell install-ucw-utils $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-perl install-perl-ucw ifdef CONFIG_DOC diff --git a/ucw/perl/UCW/Configure/Makefile b/ucw/perl/UCW/Configure/Makefile index 697e3e5d..35120450 100644 --- a/ucw/perl/UCW/Configure/Makefile +++ b/ucw/perl/UCW/Configure/Makefile @@ -8,8 +8,12 @@ PROGS+=$(CONFIGURE_MODULES) $(CONFIGURE_MODULES) : PERL_MODULE_DIR=UCW/Configure -UCW_PERL_INSTALL+=install-perl-ucw-configure +# XXX: This is a hack. UCW::Configure is a part of the build system, +# not of LibUCW proper. Nevertheless, we should avoid moving things +# around in point releases, so we are keeping it here with a special +# installation target. install-perl-ucw-configure: install -d -m 755 $(DESTDIR)$(INSTALL_PERL_DIR)/UCW/Configure + install -m 644 $(s)/ucw/perl/UCW/Configure.pm $(DESTDIR)$(INSTALL_PERL_DIR)/UCW install -m 644 $(addprefix $(s)/ucw/perl/UCW/Configure/,$(UCW_CONFIGURE_PERL_MODULES)) $(DESTDIR)$(INSTALL_PERL_DIR)/UCW/Configure .PHONY: install-perl-ucw-configure diff --git a/ucw/perl/UCW/Makefile b/ucw/perl/UCW/Makefile index 149dfd41..41e44f13 100644 --- a/ucw/perl/UCW/Makefile +++ b/ucw/perl/UCW/Makefile @@ -2,7 +2,8 @@ DIRS+=ucw/perl/UCW EXTRA_RUNDIRS+=lib/perl5/UCW -UCW_PERL_MODULES=$(addsuffix .pm,Config Log CGI Configure) +UCW_PERL_MODULES=$(addsuffix .pm,Config Log CGI) +# XXX: Configure.pm omitted intentionally, see install-perl-ucw-configure PROGS+=$(addprefix $(o)/ucw/perl/UCW/,$(UCW_PERL_MODULES)) include $(s)/ucw/perl/UCW/CGI/Makefile -- 2.39.2