From c0bd431eb71e3e0e5612acb60bf4a56501fd0159 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Mon, 20 Feb 2017 13:31:30 -0600 Subject: [PATCH] The following changes were made to Makefile: * Added glibc as dependency * Changed version string to new format * Corrected test section * Added BRIEF to dhcpd and dhclient makefiles --- Makefile | 7 +++---- Makefile.dhclient | 3 ++- Makefile.dhcpd | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 54bf6b0..cedfe68 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,10 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -export DEPENDS = +export DEPENDS = glibc export ARCH = x86_64 export URL = https://www.isc.org/ -DESC = -SNAPVER = sr1 +SNAPVER = 2 PWD := $(shell pwd) ROOT := $(PWD)/ROOT @@ -76,7 +75,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure $(SRCDIR)/client/dhclient: $(SRCDIR)/config.log @cd $(SRCDIR) && make -test: $(ROOT) +test: $(DHCLIENTROOT) $(DHCPDROOT) @cd $(SRCDIR); \ make check diff --git a/Makefile.dhclient b/Makefile.dhclient index 6d7161c..e0c8adb 100644 --- a/Makefile.dhclient +++ b/Makefile.dhclient @@ -8,8 +8,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +BRIEF = DHCP Client DESC = The Internet Systems Consortium DHCP Client, dhclient, \ -provides a means for configuring one or more network interfaces using \ +provides a means for configuring one or more network interfaces using \ the Dynamic Host Configuration Protocol include /usr/share/snap/Makefile.snaplinux diff --git a/Makefile.dhcpd b/Makefile.dhcpd index 40a2bd9..a5e313d 100644 --- a/Makefile.dhcpd +++ b/Makefile.dhcpd @@ -8,6 +8,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +BRIEF = DHCP server DESC = The Internet Systems Consortium DHCP Server, dhcpd, implements the \ Dynamic Host Configuration Protocol (DHCP) and the Internet Bootstrap \ Protocol (BOOTP)