diff options
| -rw-r--r-- | debian/patches/01-prefix.diff | 11 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 8 | ||||
| -rw-r--r-- | global.h | 10 | ||||
| -rw-r--r-- | lumina.pro | 6 | ||||
| -rwxr-xr-x | make-global-h.sh | 7 |
6 files changed, 13 insertions, 30 deletions
diff --git a/debian/patches/01-prefix.diff b/debian/patches/01-prefix.diff deleted file mode 100644 index 841707dc..00000000 --- a/debian/patches/01-prefix.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/global.h b/global.h -index 6a5fded..7e015f0 100644 ---- a/global.h -+++ b/global.h -@@ -6,5 +6,5 @@ - //=========================================== - - #ifndef PREFIX -- #define PREFIX QString("/usr/local") -+ #define PREFIX QString("/usr") - #endif diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a6de8ad9..00000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01-prefix.diff diff --git a/debian/rules b/debian/rules index a75cab86..62cfacc9 100755 --- a/debian/rules +++ b/debian/rules @@ -10,23 +10,15 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed DEB_PREF = $(shell gcc -print-multiarch) USER_QMAKE_FLAGS = PREFIX=/usr LIBPREFIX=/usr/lib/$(DEB_PEF) -QMAKE_EXTRA_DIRS = libLumina \ - lumina-config \ - lumina-desktop \ - lumina-fm \ - lumina-open \ - lumina-screenshot %: dh $@ build: qmake-qt4 $(USER_QMAKE_FLAGS) - for d in $(QMAKE_EXTRA_DIRS) ; do (cd $$d && qmake-qt4 $(USER_QMAKE_FLAGS)); done override_dh_auto_clean: -$(MAKE) distclean - -find $(CURDIR) -name *.qm | xargs rm override_dh_strip: dh_strip -a --dbg-package=libluminautils-dbg diff --git a/global.h b/global.h deleted file mode 100644 index 6a5fded5..00000000 --- a/global.h +++ /dev/null @@ -1,10 +0,0 @@ -//=========================================== -// Lumina-DE source code -// Copyright (c) 2014, Christopher Roy Bratusek -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== - -#ifndef PREFIX - #define PREFIX QString("/usr/local") -#endif @@ -1,3 +1,9 @@ +isEmpty(PREFIX) { + PREFIX = /usr/local +} + +system(make-global-h.sh $$PREFIX) + TEMPLATE = subdirs SUBDIRS+= libLumina \ diff --git a/make-global-h.sh b/make-global-h.sh new file mode 100755 index 00000000..f6457848 --- /dev/null +++ b/make-global-h.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# create global.h + +echo "#ifndef PREFIX + #define PREFIX QString(\"${1}\") +#endif" > global.h |