From 319401eb51d75d4508ae2c0c292ab70aad5735b8 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Mon, 22 May 2017 14:46:14 -0500 Subject: [PATCH] Corrected issue in assignment to $(SNAP) in Makefile.snaplinux --- Makefile | 4 +--- SRC/snap/Makefile.snaplinux | 9 ++++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 72cb4c8..a2502bb 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,6 @@ SRCDIR := $(PWD)/SRC/snap PATCHDIR := $(PWD)/SRC/patches VERSION := 0.6-0 -MAKEINST = make install - include /usr/share/snap/Makefile.snaplinux $(ROOT): $(SRCDIR)/Makefile @@ -29,7 +27,7 @@ $(ROOT): $(SRCDIR)/Makefile mkdir -v $(ROOT); \ fi - @cd $(SRCDIR) && $(MAKEINST) DESTDIR=$(ROOT) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) clean: @rm -rvf $(ROOT) \ diff --git a/SRC/snap/Makefile.snaplinux b/SRC/snap/Makefile.snaplinux index 2047008..3353d4a 100644 --- a/SRC/snap/Makefile.snaplinux +++ b/SRC/snap/Makefile.snaplinux @@ -17,8 +17,8 @@ ROOT = $(PWD)/ROOT # of the package file. Added for the kernel package # though could be useful for others -ifeq ( $(SNAP), ) -SNAP = $(PACKAGE)-$(VERSION).snap +ifndef SNAP +SNAP := $(PACKAGE)-$(VERSION).snap endif SNAPINFO = $(SNAPDIR)/snapinfo @@ -31,7 +31,7 @@ FILES = $(SNAPDIR)/files.tar.gz # if we find that not to be supplied we're going to # assume that the SRCPKG is the same as the PACKAGE -ifeq ( $(SRCPKG), ) +ifndef SRCPKG) SRCPKG := $(PACKAGE) endif @@ -116,12 +116,15 @@ $(FILES): $(ROOT) type=`file -i $$file|sed 's/.*: //'`; \ case $$type in \ *'/x-executable; charset=binary') \ + echo "--strip-unneeded $$file"; \ strip --strip-unneeded $$file \ ;; \ *'/x-object; charset=binary') \ + echo "--strip-debug $$file"; \ strip --strip-debug $$file \ ;; \ *'/x-sharedlib; charset=binary') \ + echo "--strip-debug $$file"; \ strip --strip-debug $$file \ ;; \ esac; \