From 8142fcd3cebd34519b98f3d4f8249ae111aa037c Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Thu, 30 Mar 2017 16:15:45 -0500 Subject: [PATCH] The following changes were made: * removed unused variables in Makefile * added missing && during the ROOT building phase --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 372d7e4..3cb8159 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ export URL = https://www.gnu.org/software/ncurses/ BRIEF = Library and tools for terminal handling DESC = The Ncurses (new curses) library is a free software emulation of \ curses in System V Release 4.0, and more. -SNAPVER = 1 +SNAPVER = 2 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -27,8 +27,6 @@ export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \ DEV := $(PWD)/ncurses-dev DEVROOT := $(DEV)/ROOT -MAKE = make -MAKEINST = make install include /usr/share/snap/Makefile.snaplinux $(SRCDIR)/configure: $(ARCHIVE) @@ -100,7 +98,7 @@ $(ROOT): $(SRCDIR)/objects/cursesmain.o mkdir -p $$path; \ mv $$file $$path; \ done && \ - cp -v -R $(SRCDIR)/doc/* $(DEVROOT)/usr/share/doc/ncurses + cp -v -R $(SRCDIR)/doc/* $(DEVROOT)/usr/share/doc/ncurses && \ find $(ROOT) -type d -empty -delete && \ cd $(DEV) && make -f ../Makefile.ncurses-dev && mv *.snap ../