jlarson/snap
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Corrected issue in assignment to $(SNAP) in Makefile.snaplinux

Browse Source
This commit is contained in:
Jay Larson
2017-05-22 14:46:14 -05:00
parent 4cd5b95d7e
commit 319401eb51
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -18,8 +18,6 @@ SRCDIR := $(PWD)/SRC/snap
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
VERSION := 0.6-0 VERSION := 0.6-0
MAKEINST = make install
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
$(ROOT): $(SRCDIR)/Makefile $(ROOT): $(SRCDIR)/Makefile
@@ -29,7 +27,7 @@ $(ROOT): $(SRCDIR)/Makefile
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(SRCDIR) && $(MAKEINST) DESTDIR=$(ROOT) @cd $(SRCDIR) && make install DESTDIR=$(ROOT)
clean: clean:
@rm -rvf $(ROOT) \ @rm -rvf $(ROOT) \

9
SRC/snap/Makefile.snaplinux
View File

@@ -17,8 +17,8 @@ ROOT = $(PWD)/ROOT
# of the package file. Added for the kernel package # of the package file. Added for the kernel package
# though could be useful for others # though could be useful for others
ifeq ( $(SNAP), ) ifndef SNAP
SNAP = $(PACKAGE)-$(VERSION).snap SNAP := $(PACKAGE)-$(VERSION).snap
endif endif
SNAPINFO = $(SNAPDIR)/snapinfo SNAPINFO = $(SNAPDIR)/snapinfo
@@ -31,7 +31,7 @@ FILES = $(SNAPDIR)/files.tar.gz
# if we find that not to be supplied we're going to # if we find that not to be supplied we're going to
# assume that the SRCPKG is the same as the PACKAGE # assume that the SRCPKG is the same as the PACKAGE
ifeq ( $(SRCPKG), ) ifndef SRCPKG)
SRCPKG := $(PACKAGE) SRCPKG := $(PACKAGE)
endif endif
@@ -116,12 +116,15 @@ $(FILES): $(ROOT)
type=`file -i $$file|sed 's/.*: //'`; \ type=`file -i $$file|sed 's/.*: //'`; \
case $$type in \ case $$type in \
*'/x-executable; charset=binary') \ *'/x-executable; charset=binary') \
echo "--strip-unneeded $$file"; \
strip --strip-unneeded $$file \ strip --strip-unneeded $$file \
;; \ ;; \
*'/x-object; charset=binary') \ *'/x-object; charset=binary') \
echo "--strip-debug $$file"; \
strip --strip-debug $$file \ strip --strip-debug $$file \
;; \ ;; \
*'/x-sharedlib; charset=binary') \ *'/x-sharedlib; charset=binary') \
echo "--strip-debug $$file"; \
strip --strip-debug $$file \ strip --strip-debug $$file \
;; \ ;; \
esac; \ esac; \