diff --git a/Makefile b/Makefile index 4ce1025..a26dc12 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ export SRCPKG = dhcp export ARCH = x86_64 export URL = https://www.isc.org/ BRIEF = Source package for dhcpd and dhclient -SNAPVER = 6 +SLVER = 7 PWD := $(shell pwd) ROOT := $(PWD)/ROOT @@ -23,7 +23,7 @@ TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') PATCHDIR := $(PWD)/SRC/patches export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \ - sed 's/^-//')-$(SNAPVER) + sed 's/^-//')-$(SLVER) DHCLIENT := $(PWD)/dhclient export DHCLIENTROOT := $(DHCLIENT)/ROOT @@ -31,20 +31,20 @@ DHCPD := $(PWD)/dhcpd export DHCPDROOT := $(DHCPD)/ROOT $(DHCPDROOT): $(DHCLIENTROOT) - @install -v -d $(DHCPD)/SNAP && \ + @install -v -d $(DHCPD)/SL && \ install -v -d $(DHCPDROOT) @cd $(SRCDIR) && make -C server install DESTDIR=$(DHCPDROOT) @cd $(DHCPD) && make -f ../Makefile.dhcpd && \ - mv *.snap ../ + mv *.slp ../ $(DHCLIENTROOT): $(SRCDIR)/client/dhclient - @install -v -d $(DHCLIENT)/SNAP && \ + @install -v -d $(DHCLIENT)/SL && \ install -v -d $(DHCLIENTROOT) @cd $(SRCDIR) && make -C client install DESTDIR=$(DHCLIENTROOT) @install -v -m 755 $(SRCDIR)/client/scripts/linux \ $(DHCLIENTROOT)/sbin/dhclient-script @cd $(DHCLIENT) && make -f ../Makefile.dhclient && \ - mv *.snap ../ + mv *.slp ../ $(SRCDIR)/configure: $(ARCHIVE) @if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ @@ -86,7 +86,7 @@ clean: @rm -rvf $(ROOT) \ $(DHCLIENT) \ $(DHCPD) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ $(SRCDIR) diff --git a/Makefile.dhclient b/Makefile.dhclient index bce6984..a119e8c 100644 --- a/Makefile.dhclient +++ b/Makefile.dhclient @@ -15,4 +15,4 @@ DESC = The Internet Systems Consortium DHCP Client, dhclient, \ provides a means for configuring one or more network interfaces using \ the Dynamic Host Configuration Protocol -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/Makefile.dhcpd b/Makefile.dhcpd index c017515..c6913a0 100644 --- a/Makefile.dhcpd +++ b/Makefile.dhcpd @@ -15,4 +15,4 @@ DESC = The Internet Systems Consortium DHCP Server, dhcpd, implements the \ Dynamic Host Configuration Protocol (DHCP) and the Internet Bootstrap \ Protocol (BOOTP) -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/SNAP/README b/SL/README similarity index 100% rename from SNAP/README rename to SL/README