X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=time-slider.git;a=blobdiff_plain;f=Makefile;h=3b95458ea29af7927c6eb3d98281283723c004a7;hp=346ebe8c82493d27a3d5b1e0cbac293fcd945242;hb=467e4548ca3d2adec3e75fd6b499861b5f7d0c73;hpb=d021224696e8524cab857c27370e33aeaf024130

diff --git a/Makefile b/Makefile
index 346ebe8..3b95458 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,20 @@
-include VERSION
+ifeq ($(wildcard .git),)
+	include VERSION
+else
+	VERSION=$(shell git describe)
+endif
 
 mkinstalldirs = /usr/bin/mkdir -p
-INSTALL = /usr/sbin/install
-INSTALL_DATA = ${INSTALL} -u root -g bin -m 644 -f
-INSTALL_PROGRAM = ${INSTALL} -u root -g bin -f
-INSTALL_SCRIPT = ${INSTALL} -f
+INSTALL = /usr/bin/install
+INSTALL_DATA = ${INSTALL} -m 644 -t
+INSTALL_PROGRAM = ${INSTALL} -t
+INSTALL_SCRIPT = ${INSTALL} -t
 RM = /usr/bin/rm -f
 RMRF = /usr/bin/rm -Rf
 RMDIR = /usr/bin/rmdir
 # Use python 2.6 if PYTHON environent is not set
 ifeq ($(strip $(PYTHON)),)
-PYTHON = /usr/bin/python2.6
+PYTHON = /usr/bin/python2
 endif
 
 SUBDIRS = po data
@@ -98,6 +102,12 @@ install:
 		  $(INSTALL_DATA) $(DESTDIR)/usr/share/time-slider/lib/time_slider $$file; \
 		fi; \
 	done
+	$(mkinstalldirs) $(DESTDIR)/usr/share/time-slider/lib/time_slider/linux
+	for file in usr/share/time-slider/lib/time_slider/linux/*.py; do \
+		if test -f $$file ; then \
+		  $(INSTALL_DATA) $(DESTDIR)/usr/share/time-slider/lib/time_slider/linux $$file; \
+		fi; \
+	done
 	$(mkinstalldirs) $(DESTDIR)/usr/share/time-slider/lib/plugin
 	for file in usr/share/time-slider/lib/plugin/*.py; do \
 		if test -f $$file ; then \