The following changes were made to Makefile:

* Added BRIEF
  * Moved to new version scheme
  * Moved make commands to more appropriate location
This commit is contained in:
2017-02-21 14:19:38 -06:00
parent 0c2b64fe42
commit 595e062c25

View File

@@ -11,18 +11,15 @@
DEPENDS = glibc,ncurses DEPENDS = glibc,ncurses
ARCH = x86_64 ARCH = x86_64
URL = http://ex-vi.sourceforge.net/ URL = http://ex-vi.sourceforge.net/
BRIEF = Text editor
DESC = The vi editor is one of the most common text editors on Unix. DESC = The vi editor is one of the most common text editors on Unix.
SNAPVER = sr1 SNAPVER = 2
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER) VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
MAKE = make
MAKEINST = make install
SNAPHACKS =
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
@@ -45,8 +42,7 @@ $(SRCDIR)/ex: $(SRCDIR)/Makefile
@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \ @cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \
patch --verbose -Np1 -i $$patch; \ patch --verbose -Np1 -i $$patch; \
done done
@cd $(SRCDIR); \ @cd $(SRCDIR) && make
$(MAKE)
$(ROOT): $(SRCDIR)/ex $(ROOT): $(SRCDIR)/ex
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
@@ -55,10 +51,7 @@ $(ROOT): $(SRCDIR)/ex
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(SRCDIR); \ @cd $(SRCDIR) && make install DESTDIR=$(ROOT)
$(MAKEINST) DESTDIR=$(ROOT)
@$(SNAPHACKS)
test: $(ROOT) test: $(ROOT)
@cd $(SRCDIR); \ @cd $(SRCDIR); \