Author: titmuss
Date: Fri Oct 3 11:43:25 2008
New Revision: 3064
URL: http://svn.slimdevices.com?rev=3064&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r3060): tom | 2008-10-03 17:53:46 +0100
using more standard datarootdir for share dir reference
[EMAIL PROTECTED] (orig r3061): tom | 2008-10-03 18:18:31 +0100
trying again to use a more standard reference for share dir
[EMAIL PROTECTED] (orig r3062): tom | 2008-10-03 18:36:14 +0100
trying again to use a more standard reference for share dir
[EMAIL PROTECTED] (orig r3063): tom | 2008-10-03 18:39:27 +0100
reverting bb changes, fixed on make side
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Oct 3 11:43:25 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3055
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3063
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb?rev=3064&root=Jive&r1=3063&r2=3064&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
Fri Oct 3 11:43:25 2008
@@ -16,7 +16,6 @@
EXTRA_OEMAKE = "all lua-lint"
-export PREFIX=${D}
do_install() {
autotools_do_install
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb?rev=3064&root=Jive&r1=3063&r2=3064&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Fri Oct 3 11:43:25 2008
@@ -26,7 +26,6 @@
EXTRA_OEMAKE = "all lua-lint"
-export PREFIX = ${D}
do_stage() {
install -m 0644 src/ui/jive.h ${STAGING_INCDIR}/
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include?rev=3064&root=Jive&r1=3063&r2=3064&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include Fri
Oct 3 11:43:25 2008
@@ -2,7 +2,7 @@
# if you are making changes to it consider making the changes in each of the
locations.
# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
-JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
#touching to try to get jive_73 build to see this file
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3064&root=Jive&r1=3063&r2=3064&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/Makefile.in Fri Oct 3 11:43:25 2008
@@ -13,6 +13,8 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+#tw touch for poky test
#Note: This include file is duplicated in squeezeplay/, squeezeplay_jive/, and
squeezeplay_desktop/, so
# if you are making changes to it consider making the changes in each of the
locations.
@@ -226,7 +228,7 @@
# Rules for tolua++ binding files
SUFFIXES = .pkg
TOLUA = tolua++
-JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
OSX_LIB_DIR = $(PREFIX)/lib
OSX_BUILD_DIR = $(PREFIX)
JIVE_DEPENDENCIES_LIB_DIR = $(top_builddir)/.libs
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include?rev=3064&root=Jive&r1=3063&r2=3064&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
Fri Oct 3 11:43:25 2008
@@ -2,7 +2,7 @@
# if you are making changes to it consider making the changes in each of the
locations.
# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
-JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
#touching to try to get jive_73 build to see this file
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in?rev=3064&root=Jive&r1=3063&r2=3064&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in Fri Oct 3
11:43:25 2008
@@ -134,7 +134,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
all: all-am
.SUFFIXES:
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include?rev=3064&root=Jive&r1=3063&r2=3064&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
Fri Oct 3 11:43:25 2008
@@ -2,7 +2,7 @@
# if you are making changes to it consider making the changes in each of the
locations.
# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
-JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
#touching to try to get jive_73 build to see this file
Modified: 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in?rev=3064&root=Jive&r1=3063&r2=3064&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in Fri Oct 3 11:43:25
2008
@@ -222,7 +222,7 @@
jiveWatchdog_la_SOURCES = \
src/jive_watchdog.c
-JIVE_BUILD_DIR = $(PREFIX)/share/jive/
+JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
all: all-am
.SUFFIXES:
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
