From ae3b7495083a942b4196e435759054d77721164e Mon Sep 17 00:00:00 2001 From: Felix Delattre Date: Tue, 17 Aug 2021 22:08:28 +0000 Subject: [PATCH] make build independent from debian packaging --- Makefile | 2 -- .../{logrotate.d-tirex-master => etc/logrotate.d/tirex-master} | 0 debian/tirex-core.install | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) rename debian/{logrotate.d-tirex-master => etc/logrotate.d/tirex-master} (100%) diff --git a/Makefile b/Makefile index 7d45111..92dce76 100644 --- a/Makefile +++ b/Makefile @@ -61,8 +61,6 @@ install: build install -m 644 ${INSTALLOPTS} etc/renderer/mapserver/fonts.lst $(DESTDIR)/etc/tirex/renderer/mapserver/fonts.lst install -m 755 ${INSTALLOPTS} -d $(DESTDIR)/etc/tirex/renderer/mapnik install -m 644 ${INSTALLOPTS} etc/renderer/mapnik.conf.dist $(DESTDIR)/etc/tirex/renderer/mapnik.conf - install -m 755 ${INSTALLOPTS} -d $(DESTDIR)/etc/logrotate.d - install -m 644 ${INSTALLOPTS} debian/logrotate.d-tirex-master $(DESTDIR)/etc/logrotate.d/tirex-master install -m 755 ${INSTALLOPTS} -d $(DESTDIR)/usr/share/man/man1/ for program in bin/*; do \ if grep -q "=head" $$program; then \ diff --git a/debian/logrotate.d-tirex-master b/debian/etc/logrotate.d/tirex-master similarity index 100% rename from debian/logrotate.d-tirex-master rename to debian/etc/logrotate.d/tirex-master diff --git a/debian/tirex-core.install b/debian/tirex-core.install index 1f8e546..1720329 100644 --- a/debian/tirex-core.install +++ b/debian/tirex-core.install @@ -21,5 +21,5 @@ usr/share/perl5 etc/tirex/tirex.conf etc/tirex/renderer/test.conf etc/tirex/renderer/test/checkerboard.conf -etc/logrotate.d/tirex-master +debian/etc/logrotate.d/tirex-master etc/logrotate.d usr/lib/tirex/backends/test