Skip to content

Commit 48b1b4e

Browse files
committed
updated makefile
1 parent 29b0be8 commit 48b1b4e

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

makefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
VER="`git tag | tr -d 'v'`"
2-
MAKEFILELIST="makefile pkgs/debian/makefile"
3-
TARBALL-LOCATION:=pkgs/tarball
1+
VER="`git tag | sort -rn | head -1 | tr -d 'v'`"
2+
TARBALLLOC:=pkgs/tarball
43
PKGNAME:=unix-notes-$(VER)
54
TARBALL=$(PKGNAME)-tar
65
GZTARBALL=$(TARBALL).gz
@@ -19,8 +18,8 @@ help:
1918

2019
## make var Show makefile variables
2120
var:
22-
@echo Latest Git tag (Version) = $(VER)
23-
@echo Tarball Location = $(TARBALL-LOCATION)
21+
@echo Latest Git tag {Version} = $(VER)
22+
@echo Tarball Location = $(TARBALLLOC)
2423
@echo Package Name = $(PKGNAME)
2524
@echo Tarball Name = $(TARBALL)
2625
@echo Gzipped Tarball = $(GZTARBALL)
@@ -63,5 +62,5 @@ tarball:
6362
git archive v$(VER) -o $(TARBALL)
6463
gzip $(TARBALL)
6564
sha256 $(GZTARBALL) | tee $(SHATXT)
66-
mv $(GZTARBALL) $(TARBALL-LOCATION)
67-
mv $(SHATXT) $(TARBALL-LOCATION)
65+
mv $(GZTARBALL) $(TARBALLLOC)
66+
mv $(SHATXT) $(TARBALLLOC)

pkgs/debian/makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
2-
PROGNAME=unix-notes
3-
VER="`git tag | tr -d 'v'`"
4-
ARCH=all
5-
PKGBUILDDIR=$(PROGNAME)_$(VER)_$(ARCH)
1+
VER="`git tag | sort -rn | head -1 | tr -d 'v'`"
2+
PKGBUILDDIR=unix-notes_$(VER)_all
63
BINDIR=usr/local/bin
74
PKGBINDIR=$(PKGBUILDDIR)/$(BINDIR)
85
MANPATH=usr/share/man/man1
@@ -21,9 +18,7 @@ help:
2118
@sed -n s/^##//p makefile
2219

2320
var:
24-
@echo PROGNAME = $(PROGNAME)
2521
@echo Git Tag (VER) = $(VER)
26-
@echo ARCH = $(ARCH)
2722
@echo PKGBUILDIR = $(PKGBUILDDIR)
2823
@echo BINDIR = $(BINDIR)
2924
@echo PKGBINDIR = $(PKGBINDIR)

0 commit comments

Comments
 (0)