Skip to content

Commit af67b5b

Browse files
author
Michał Górny
committed
Support informative VERSION=.
1 parent 3141749 commit af67b5b

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ RULESDIR = /etc/udev/rules.d
77

88
# End of simple config, you shall not pass below
99

10+
VERSION =
11+
1012
BUILDDIR = build
1113
SRCDIR = src
1214

@@ -17,7 +19,7 @@ XMOD = 0700
1719
FMOD = 0600
1820

1921
all:
20-
cd "$(BUILDDIR)" && make $(MAKEFLAGS) \
22+
cd "$(BUILDDIR)" && make $(MAKEFLAGS) VERSION="$(VERSION)" \
2123
SCRIPTDIR="$(SCRIPTDIR)" CONFIGDIR="$(CONFIGDIR)" RULESDIR="$(RULESDIR)"
2224

2325
clean:

build/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ all: $(SCRIPTS) $(SCRIPTS_NX) $(UDEV_RULES)
1313
%.sh:
1414
sed -e 's:^\(LIBDIR=\).*$$:\1'"'"'$(SCRIPTDIR)'"':" \
1515
-e 's:^\(CONFDIR=\).*$$:\1'"'"'$(CONFIGDIR)'"':" \
16+
-e 's:^\(VERSION=\).*$$:\1$(VERSION):' \
1617
"$(SRCDIR)/$@" > "$@"
1718

1819
$(UDEV_RULES):

src/uam-common.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77

88
CONFDIR="${LIBDIR}"/..
99

10+
# Currently not used, only for informational purposes
11+
# Empty means we're using SVN trunk
12+
VERSION=
13+
1014
# Read configuration
1115

1216
conf_read() {

0 commit comments

Comments
 (0)