Author: tom
Date: Fri Oct 3 13:57:37 2008
New Revision: 3069
URL: http://svn.slimdevices.com?rev=3069&root=Jive&view=rev
Log:
trying again 3 to use a more standard reference for share dir
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in
7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am Fri Oct 3 13:57:37 2008
@@ -16,6 +16,8 @@
@find . -name "*.lua" -and \( -exec luac -p '{}' \; -or -print \) >
badsyntax
@test \! -s badsyntax
@rm -f badsyntax
+
+JIVE_BUILD_DIR = $(DESTDIR)$(pkgdatadir)
include Makefile.am.jive-install.include
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am.jive-install.include Fri
Oct 3 13:57:37 2008
@@ -2,9 +2,6 @@
# 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 = $(DESTDIR)/$(pkgdatadir)
-
-#touching to try to get jive_73 build to see this file
jive-static-install:
##Copy selectively, currently overwrites all, not just newer
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in Fri Oct 3 13:57:37 2008
@@ -228,7 +228,7 @@
# Rules for tolua++ binding files
SUFFIXES = .pkg
TOLUA = tolua++
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
+JIVE_BUILD_DIR = $(DESTDIR)$(pkgdatadir)
OSX_LIB_DIR = $(PREFIX)/lib
OSX_BUILD_DIR = $(PREFIX)
JIVE_DEPENDENCIES_LIB_DIR = $(top_builddir)/.libs
@@ -1093,8 +1093,6 @@
@test \! -s badsyntax
@rm -f badsyntax
-#touching to try to get jive_73 build to see this file
-
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
Modified: 7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am Fri Oct 3
13:57:37 2008
@@ -1,5 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
+JIVE_BUILD_DIR = $(DESTDIR)$(pkgdatadir)
include Makefile.am.jive-install.include
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.am.jive-install.include
Fri Oct 3 13:57:37 2008
@@ -1,10 +1,6 @@
#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.
# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
-
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
-
-#touching to try to get jive_73 build to see this file
jive-static-install:
##Copy selectively, currently overwrites all, not just newer
Modified: 7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay_desktop/Makefile.in Fri Oct 3
13:57:37 2008
@@ -134,7 +134,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
+JIVE_BUILD_DIR = $(DESTDIR)$(pkgdatadir)
all: all-am
.SUFFIXES:
@@ -395,8 +395,6 @@
pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
-#touching to try to get jive_73 build to see this file
-
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
Modified: 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am Fri Oct 3 13:57:37
2008
@@ -27,6 +27,8 @@
src/jive_watchdog.c
+JIVE_BUILD_DIR = $(DESTDIR)$(datadir)/jive
+
include Makefile.am.jive-install.include
install-data-local: jive-static-install
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.am.jive-install.include
Fri Oct 3 13:57:37 2008
@@ -1,10 +1,6 @@
#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.
# The reason for the duplication (rather than a shared file) is that Poky
checks out just subdirectory not the top level
-
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
-
-#touching to try to get jive_73 build to see this file
jive-static-install:
##Copy selectively, currently overwrites all, not just newer
Modified: 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in?rev=3069&root=Jive&r1=3068&r2=3069&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay_jive/Makefile.in Fri Oct 3 13:57:37
2008
@@ -222,7 +222,7 @@
jiveWatchdog_la_SOURCES = \
src/jive_watchdog.c
-JIVE_BUILD_DIR = $(DESTDIR)/$(pkgdatadir)
+JIVE_BUILD_DIR = $(DESTDIR)$(datadir)/jive
all: all-am
.SUFFIXES:
@@ -664,8 +664,6 @@
@test \! -s badsyntax
@rm -f badsyntax
-#touching to try to get jive_73 build to see this file
-
jive-static-install:
mkdir -p $(JIVE_BUILD_DIR)
cd share; tar -pcf - \
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
