From 86d536382bc475672359ec346750f8dc080d1b3b Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sun, 29 Jan 2017 10:25:07 -0600 Subject: [PATCH] Added BRIEF to Makefile --- Makefile | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 13b0e29..4678aaa 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,13 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = glibc,libcap,libncurses,libreadline ARCH = x86_64 URL = http://www.gnu.org/software/bash/ -DESC = Bash is the GNU Project\'s shell -SNAPVER = sr1 +BRIEF = Bash is the GNU Project\'s Bourne Again SHell +DESC = Bash is the GNU Project\'s Bourne Again SHell, a complete \ +implementation of the POSIX shell spec +SNAPVER = 5 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -21,13 +23,7 @@ PATCHDIR := $(PWD)/SRC/patches PATCHLVL := $(shell cat $(PATCHDIR)/*.patch|grep '\#define PATCHLEVEL'|\ tail -1|awk '{print $$NF}') VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//'|\ - sed 's/[0-9]*$$/$(PATCHLVL)/')$(SNAPVER) - -MAKE = make -MAKEINST = make install -SNAPHACKS = @if [ ! -f $(ROOT)/bin/sh ]; then \ - ln -sv bash $(ROOT)/bin/sh; fi && \ - rm -v $(ROOT)/usr/share/info/dir + sed 's/[0-9]*$$/$(PATCHLVL)/')-$(SNAPVER) include /usr/share/snap/Makefile.snaplinux @@ -61,8 +57,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --target=x86_64-snap-linux-gnu $(SRCDIR)/bash: $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make $(ROOT): $(SRCDIR)/bash @if [ -d $(ROOT) ]; then \ @@ -71,10 +66,12 @@ $(ROOT): $(SRCDIR)/bash mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + if [ ! -f $(ROOT)/bin/sh ]; then \ + ln -sv bash $(ROOT)/bin/sh; \ + fi && \ + rm -v $(ROOT)/usr/share/info/dir && \ + gzip $(ROOT)/usr/share/doc/*/{*.html,CHANGES} test: $(ROOT) @cd $(SRCDIR); \