Include all necessary files for `make dist` to work

Bumblebee-Project · 5b12852db1b42e4f3f51c3965e8c93a78b273cbf · Jan 15, 2012
commit 5b12852db1b42e4f3f51c3965e8c93a78b273cbf
1 parent f9ee53b
Unified Split

Showing with 14 additions and 2 deletions.

+11 −1  Makefile.am

+3 −1  version.sh
@@ -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
@@ -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
@@ -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)