From c6cdf6bbee27d1127847ce7bdff2a22a785f9723 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Tue, 3 May 2016 21:14:14 +0100 Subject: [PATCH] Move dhcp_release and dhcp_lease_time to contrib/lease_tools. --- contrib/{wrt => lease-tools}/Makefile | 0 contrib/{wrt => lease-tools}/dhcp_lease_time.1 | 0 contrib/{wrt => lease-tools}/dhcp_lease_time.c | 0 contrib/{wrt => lease-tools}/dhcp_release.1 | 0 contrib/{wrt => lease-tools}/dhcp_release.c | 0 debian/rules | 12 ++++++------ 6 files changed, 6 insertions(+), 6 deletions(-) rename contrib/{wrt => lease-tools}/Makefile (100%) rename contrib/{wrt => lease-tools}/dhcp_lease_time.1 (100%) rename contrib/{wrt => lease-tools}/dhcp_lease_time.c (100%) rename contrib/{wrt => lease-tools}/dhcp_release.1 (100%) rename contrib/{wrt => lease-tools}/dhcp_release.c (100%) diff --git a/contrib/wrt/Makefile b/contrib/lease-tools/Makefile similarity index 100% rename from contrib/wrt/Makefile rename to contrib/lease-tools/Makefile diff --git a/contrib/wrt/dhcp_lease_time.1 b/contrib/lease-tools/dhcp_lease_time.1 similarity index 100% rename from contrib/wrt/dhcp_lease_time.1 rename to contrib/lease-tools/dhcp_lease_time.1 diff --git a/contrib/wrt/dhcp_lease_time.c b/contrib/lease-tools/dhcp_lease_time.c similarity index 100% rename from contrib/wrt/dhcp_lease_time.c rename to contrib/lease-tools/dhcp_lease_time.c diff --git a/contrib/wrt/dhcp_release.1 b/contrib/lease-tools/dhcp_release.1 similarity index 100% rename from contrib/wrt/dhcp_release.1 rename to contrib/lease-tools/dhcp_release.1 diff --git a/contrib/wrt/dhcp_release.c b/contrib/lease-tools/dhcp_release.c similarity index 100% rename from contrib/wrt/dhcp_release.c rename to contrib/lease-tools/dhcp_release.c diff --git a/debian/rules b/debian/rules index 8612092..193b30c 100755 --- a/debian/rules +++ b/debian/rules @@ -93,7 +93,7 @@ clean: $(checkdir) rm -rf debian/daemon debian/base debian/utils debian/*~ debian/files debian/substvars debian/utils-substvars make clean - make -C contrib/wrt clean + make -C contrib/lease-tools clean binary-indep: checkroot $(checkdir) @@ -184,12 +184,12 @@ ifeq ($(DEB_HOST_ARCH_OS),linux) -d debian/utils/usr/share/man/man1 \ -d debian/utils/usr/bin \ -d debian/utils/usr/share/doc/dnsmasq-utils - make -C contrib/wrt PREFIX=/usr DESTDIR=`pwd`/debian/utils CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="$(DEB_COPTS)" CC=gcc - install -m 755 contrib/wrt/dhcp_release debian/utils/usr/bin/dhcp_release - install -m 644 contrib/wrt/dhcp_release.1 debian/utils/usr/share/man/man1/dhcp_release.1 + make -C contrib/lease-tools PREFIX=/usr DESTDIR=`pwd`/debian/utils CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="$(DEB_COPTS)" CC=gcc + install -m 755 contrib/lease-tools/dhcp_release debian/utils/usr/bin/dhcp_release + install -m 644 contrib/lease-tools/dhcp_release.1 debian/utils/usr/share/man/man1/dhcp_release.1 gzip -9n debian/utils/usr/share/man/man1/dhcp_release.1 - install -m 755 contrib/wrt/dhcp_lease_time debian/utils/usr/bin/dhcp_lease_time - install -m 644 contrib/wrt/dhcp_lease_time.1 debian/utils/usr/share/man/man1/dhcp_lease_time.1 + install -m 755 contrib/lease-tools/dhcp_lease_time debian/utils/usr/bin/dhcp_lease_time + install -m 644 contrib/lease-tools/dhcp_lease_time.1 debian/utils/usr/share/man/man1/dhcp_lease_time.1 install -m 644 debian/copyright debian/utils/usr/share/doc/dnsmasq-utils/copyright install -m 644 debian/changelog debian/utils/usr/share/doc/dnsmasq-utils/changelog.Debian gzip -9n debian/utils/usr/share/doc/dnsmasq-utils/changelog.Debian