diff --git a/Makefile b/Makefile index 996ebda..1bc1e61 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,11 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = acl,attr,glibc ARCH = x86_64 URL = https://www.gnu.org/software/sed/ DESC = sed (stream editor) is a non-interactive command-line text editor -SNAPVER = sr0 +SNAPVER = sr1 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -20,11 +20,6 @@ SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') PATCHDIR := $(PWD)/SRC/patches VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER) -MAKE = make && make html -MAKEINST = make install DESTDIR=$(ROOT) && make -C doc install-html \ - DESTDIR=$(ROOT) -SNAPHACKS = - include /usr/share/snap/Makefile.snaplinux $(SRCDIR)/configure: $(ARCHIVE) @@ -55,8 +50,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --target=x86_64-snap-linux-gnu $(SRCDIR)/sed/sed: $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make && make html $(ROOT): $(SRCDIR)/sed/sed @if [ -d $(ROOT) ]; then \ @@ -65,10 +59,9 @@ $(ROOT): $(SRCDIR)/sed/sed mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + make -C doc install-html DESTDIR=$(ROOT) && \ + rm -v $(ROOT)/usr/share/info/dir test: $(ROOT) @cd $(SRCDIR); \