From 79e3185f3318654285766d849c0c06d713517251 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Tue, 26 Feb 2019 14:39:08 +0300 Subject: Packages: fixed packages build, broken in 00d8049418cf. --- pkg/deb/debian.module/rules.in | 2 ++ pkg/deb/debian/rules.in | 2 ++ pkg/rpm/Makefile | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in index 22e381fe..e41b05d4 100755 --- a/pkg/deb/debian.module/rules.in +++ b/pkg/deb/debian.module/rules.in @@ -22,6 +22,7 @@ config.env.%: cp -Pa $(CURDIR)/configure $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/version $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit @@ -65,6 +66,7 @@ clean: dh_testroot dh_clean find $(CURDIR) -maxdepth 1 -size 0 -delete + rm -rf $(BUILDDIR_unit) $(BUILDDIR_unit_debug) install: build dh_testdir diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in index 7eab391d..a8c4c948 100644 --- a/pkg/deb/debian/rules.in +++ b/pkg/deb/debian/rules.in @@ -26,6 +26,7 @@ config.env.%: cp -Pa $(CURDIR)/configure $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/version $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit @@ -83,6 +84,7 @@ clean: dh_testroot dh_clean find $(CURDIR) -maxdepth 1 -size 0 -delete + rm -rf $(BUILDDIR_unit) $(BUILDDIR_unit_debug) install: build do.tests dh_testdir diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 2157e808..56cf31b5 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -170,7 +170,7 @@ endif rpmbuild/SOURCES/unit-$(VERSION).tar.gz: cd ../.. && tar -czf pkg/rpm/rpmbuild/SOURCES/unit-$(VERSION).tar.gz \ --transform "s#^#unit-$(VERSION)/#" \ - LICENSE NOTICE CHANGES README configure auto src test + LICENSE NOTICE CHANGES README configure auto src test version unit: check-build-depends-unit rpmbuild/SPECS/unit.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz @echo "===> Building $@ package" ; \ -- cgit