Skip to content
This repository
Browse code

Include all necessary files for `make dist` to work

  • Loading branch information...
commit 5b12852db1b42e4f3f51c3965e8c93a78b273cbf 1 parent f9ee53b
Peter Wu Lekensteyn authored

Showing 2 changed files with 14 additions and 2 deletions. Show diff stats Hide diff stats

  1. +11 1 Makefile.am
  2. +3 1 version.sh
12 Makefile.am
@@ -21,7 +21,14 @@ endif
21 21 CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf
22 22 EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
23 23 scripts/upstart/bumblebeed.conf.in \
24   - conf/bumblebee.conf.in
  24 + conf/bumblebee.conf.in \
  25 + conf/xorg.conf.nvidia \
  26 + conf/xorg.conf.nouveau \
  27 + README.markdown doc/daemon.notes \
  28 + scripts/bash_completion/bumblebee \
  29 + version.sh
  30 +# for laziness include all headers found
  31 +EXTRA_DIST += src/*.h src/*/switching.h
25 32
26 33 if WITH_PIDFILE
27 34 EXTRA_DIST += scripts/sysvinit/bumblebeed.in
@@ -89,3 +96,6 @@ doc/bumblebeed.1: $(bin_bumblebeed_SOURCES)
89 96 else
90 97 @echo "Warning: help2man not available, no man page is created."
91 98 endif
  99 +
  100 +dist-hook:
  101 + echo $(PACKAGE_VERSION) > $(distdir)/VERSION
4 version.sh
@@ -7,7 +7,9 @@ if [ -z "$PACKAGE_VERSION" ]; then
7 7 2>/dev/null)"
8 8 fi
9 9
10   -if [ -d "$rootdir/.git" ]; then
  10 +[ ! -f "$1/VERSION" ] || VN="$(cat VERSION)"
  11 +
  12 +if [ -z "$VN" ] && [ -d "$rootdir/.git" ]; then
11 13 VN=$(cd "$rootdir" &&
12 14 git describe --tags --match 'v[0-9]*' 2>/dev/null)
13 15

0 comments on commit 5b12852

Please sign in to comment.
Something went wrong with that request. Please try again.