summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-24 13:17:03 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-24 13:17:03 -0500
commit2e3f9c8f1b3d6dab9fa144db7639e716f462807d (patch)
tree5c07ff8e6a6fdb25efb023fcf882b0a5563970e1
parent29026fe97c4a0eab32db8340a850bfc63c4bd341 (diff)
downloadtde-packaging-2e3f9c8f1b3d6dab9fa144db7639e716f462807d.tar.gz
tde-packaging-2e3f9c8f1b3d6dab9fa144db7639e716f462807d.zip
Fix guidance modules search path on Debian and Ubuntu
This relates to Bug 1995
-rwxr-xr-xdebian/squeeze/applications/tde-guidance/debian/rules17
-rw-r--r--[-rwxr-xr-x]ubuntu/maverick/applications/tde-guidance/debian/rules17
2 files changed, 20 insertions, 14 deletions
diff --git a/debian/squeeze/applications/tde-guidance/debian/rules b/debian/squeeze/applications/tde-guidance/debian/rules
index 5046494ad..90ab6816a 100755
--- a/debian/squeeze/applications/tde-guidance/debian/rules
+++ b/debian/squeeze/applications/tde-guidance/debian/rules
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport
+PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
+GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
+export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/class/python-distutils.mk
@@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
-PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
+PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS_APPEND := -L/opt/trinity/lib
@@ -43,11 +46,11 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
+# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
# move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
@@ -111,7 +114,7 @@ install/tde-guidance-powermanager-trinity::
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
- echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+ echo "$(PYSUPPORT_INST_PATH)/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index 5046494ad..90ab6816a 100755..100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport
+PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
+GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
+export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/class/python-distutils.mk
@@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
-PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
+PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS_APPEND := -L/opt/trinity/lib
@@ -43,11 +46,11 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
- (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
+ (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
+# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
# move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
@@ -111,7 +114,7 @@ install/tde-guidance-powermanager-trinity::
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
- echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+ echo "$(PYSUPPORT_INST_PATH)/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable