Corrected issue in assignment to $(SNAP) in Makefile.snaplinux
This commit is contained in:
4
Makefile
4
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) \
|
||||
|
||||
@@ -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; \
|
||||
|
||||
Reference in New Issue
Block a user