main/psmisc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added depends, moved some binaries, and cleaned up Makefile

Browse Source
This commit is contained in:
Jay Larson
2016-10-28 15:15:57 -05:00
parent 85a8ffab94
commit 552afcdc3f
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@@ -8,11 +8,11 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS = DEPENDS = glibc,ncurses
ARCH = x86_64 ARCH = x86_64
URL = https://gitlab.com/psmisc/psmisc/ URL = https://gitlab.com/psmisc/psmisc/
DESC = A package of small utilities that use the proc file-system. 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) 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')
@@ -20,10 +20,6 @@ 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
$(SRCDIR)/autogen.sh: $(ARCHIVE) $(SRCDIR)/autogen.sh: $(ARCHIVE)
@@ -53,8 +49,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/autogen.sh
--target=x86_64-snap-linux-gnu --target=x86_64-snap-linux-gnu
$(SRCDIR)/src/peekfd: $(SRCDIR)/config.log $(SRCDIR)/src/peekfd: $(SRCDIR)/config.log
@cd $(SRCDIR); \ @cd $(SRCDIR) && make
$(MAKE)
$(ROOT): $(SRCDIR)/src/peekfd $(ROOT): $(SRCDIR)/src/peekfd
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
@@ -63,10 +58,9 @@ $(ROOT): $(SRCDIR)/src/peekfd
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(SRCDIR); \ @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
$(MAKEINST) DESTDIR=$(ROOT) install -v -d -m 755 $(ROOT)/bin && \
mv -v $(ROOT)/usr/bin/{fuser,killall} $(ROOT)/bin
@$(SNAPHACKS)
clean: clean:
@rm -rvf $(ROOT) \ @rm -rvf $(ROOT) \