diff --git a/Makefile b/Makefile index 25acf8a..5ea5de9 100644 --- a/Makefile +++ b/Makefile @@ -8,25 +8,19 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = glibc,ncurses ARCH = x86_64 URL = https://gitlab.com/procps-ng/procps +BRIEF = Utilities providing process information DESC = procps is a set of command line and full-screen utilities that provide \ information out of the pseudo-filesystem most commonly located at /proc -SNAPVER = sr0 +SNAPVER = 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') 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 -MAKEINST = make install -SNAPHACKS = install -d -v -m 755 $(ROOT)/lib && \ - mv -v $(ROOT)/usr/lib/libprocps.so.* $(ROOT)/lib && \ - ln -sfv ../../lib/$(readlink $(ROOT)/usr/lib/libprocps.so) \ - $(ROOT)/usr/lib/libprocps.so +VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER) include /usr/share/snap/Makefile.snaplinux @@ -61,8 +55,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --target=x86_64-snap-linux-gnu $(SRCDIR)/watch: $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make $(ROOT): $(SRCDIR)/watch @if [ -d $(ROOT) ]; then \ @@ -71,10 +64,11 @@ $(ROOT): $(SRCDIR)/watch mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + install -d -v -m 755 $(ROOT)/lib && \ + mv -v $(ROOT)/usr/lib/libprocps.so.* $(ROOT)/lib && \ + ln -sfv ../../lib/$(readlink $(ROOT)/usr/lib/libprocps.so) \ + $(ROOT)/usr/lib/libprocps.so test: $(ROOT) @cd $(SRCDIR); \