Skip to content

Commit

Permalink
Include all necessary files for make dist to work
Browse files Browse the repository at this point in the history
  • Loading branch information
Lekensteyn committed Jan 15, 2012
1 parent f9ee53b commit 5b12852
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
12 changes: 11 additions & 1 deletion Makefile.am
Expand Up @@ -21,7 +21,14 @@ endif
CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf
EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
scripts/upstart/bumblebeed.conf.in \
conf/bumblebee.conf.in
conf/bumblebee.conf.in \
conf/xorg.conf.nvidia \
conf/xorg.conf.nouveau \
README.markdown doc/daemon.notes \
scripts/bash_completion/bumblebee \
version.sh
# for laziness include all headers found
EXTRA_DIST += src/*.h src/*/switching.h

if WITH_PIDFILE
EXTRA_DIST += scripts/sysvinit/bumblebeed.in
Expand Down Expand Up @@ -89,3 +96,6 @@ doc/bumblebeed.1: $(bin_bumblebeed_SOURCES)
else
@echo "Warning: help2man not available, no man page is created."
endif

dist-hook:
echo $(PACKAGE_VERSION) > $(distdir)/VERSION
4 changes: 3 additions & 1 deletion version.sh
Expand Up @@ -7,7 +7,9 @@ if [ -z "$PACKAGE_VERSION" ]; then
2>/dev/null)"
fi

if [ -d "$rootdir/.git" ]; then
[ ! -f "$1/VERSION" ] || VN="$(cat VERSION)"

if [ -z "$VN" ] && [ -d "$rootdir/.git" ]; then
VN=$(cd "$rootdir" &&
git describe --tags --match 'v[0-9]*' 2>/dev/null)

Expand Down

0 comments on commit 5b12852

Please sign in to comment.