diff --git a/Makefile b/Makefile index dd01c5c..f81d68f 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 = glibc,ncurses ARCH = x86_64 URL = https://gitlab.com/psmisc/psmisc/ DESC = A package of small utilities that use the proc file-system. -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,10 +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 -MAKEINST = make install -SNAPHACKS = - include /usr/share/snap/Makefile.snaplinux $(SRCDIR)/autogen.sh: $(ARCHIVE) @@ -53,8 +49,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/autogen.sh --target=x86_64-snap-linux-gnu $(SRCDIR)/src/peekfd: $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make $(ROOT): $(SRCDIR)/src/peekfd @if [ -d $(ROOT) ]; then \ @@ -63,10 +58,9 @@ $(ROOT): $(SRCDIR)/src/peekfd mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + install -v -d -m 755 $(ROOT)/bin && \ + mv -v $(ROOT)/usr/bin/{fuser,killall} $(ROOT)/bin clean: @rm -rvf $(ROOT) \