summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xssn.at>2010-10-29 22:37:14 +0200
committerFlorian Pritz <bluewind@xssn.at>2010-10-29 22:42:46 +0200
commitf7d95139d88c20e6dc4f29df0a0189f22526066d (patch)
tree6cf2bdf868199cae41e0f18a8b6bc7bd0452d0bb
parent0b42100bfaf1a237c6254a9737ec5d7623f77840 (diff)
change the way we generate dist tarballs
This no longer displays (git) errors if you use the release tarball. It also adds a make target for fb in order to get rid of the git checking inside fb. Signed-off-by: Florian Pritz <bluewind@xssn.at>
-rw-r--r--.gitignore1
-rw-r--r--Makefile14
-rw-r--r--[-rwxr-xr-x]fb.in (renamed from fb)7
3 files changed, 12 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index c2566cc..13615f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
dist
fb.1
+fb
diff --git a/Makefile b/Makefile
index 03bf66d..7252bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,18 @@ VERSION:=$(shell git describe | sed 's/^v//')
MANDIR=/usr/share/man
BINDIR=/usr/bin
-all: fb.1
+all: fb.1 fb
+
+fb: fb.in
+ @[ -n "$(VERSION)" ] || (echo "Error: version detection failed"; exit 1)
+ sed 's/@VERSION@/$(VERSION)/' fb.in > fb
+ chmod 755 fb
fb.1: fb.pod
pod2man -c "" fb.pod fb.1
clean:
- rm -f fb.1
+ rm -f fb.1 fb
rm -rf dist
install: all
@@ -20,9 +25,10 @@ uninstall:
rm -f $(DESTDIR)$(MANDIR)/man1/fb.1
dist: all
+ @[ -n "$(VERSION)" ] || (echo "Error: version detection failed"; exit 1)
mkdir -p dist/fb-$(VERSION)
- cp -a fb fb.pod fb.1 COPYING Makefile dist/fb-$(VERSION)
- sed -i 's/^VERSION=.*$$/VERSION="'$(VERSION)'"/' dist/fb-$(VERSION)/fb
+ cp -a fb fb.in fb.pod fb.1 COPYING Makefile dist/fb-$(VERSION)
+ sed -i 's/^VERSION:=.*$$/VERSION:="'$(VERSION)'"/' dist/fb-$(VERSION)/Makefile
cd dist; tar -czf fb-$(VERSION).tar.gz fb-$(VERSION)
version:
diff --git a/fb b/fb.in
index 6781ed4..67f58a5 100755..100644
--- a/fb
+++ b/fb.in
@@ -11,12 +11,7 @@
# Optional: xclip
#----------------------------------------------------
-SCRIPTDIR="`dirname "$0"`"
-VERSION="`cd $SCRIPTDIR; git describe 2>/dev/null | sed 's/^v//'`"
-
-if [ -z "$VERSION" ]; then
- VERSION="unknown"
-fi
+VERSION="@VERSION@"
DELETE=
EXTENSION=""