|
From: <br...@us...> - 2008-10-06 21:46:13
|
Revision: 3726
http://openvrml.svn.sourceforge.net/openvrml/?rev=3726&view=rev
Author: braden
Date: 2008-10-06 21:46:04 +0000 (Mon, 06 Oct 2008)
Log Message:
-----------
Process org.openvrml.BrowserControl.service.in with sed (rather than config.status) so that substitutions that expand to make macros get fully resolved.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
trunk/src/Makefile.am
Property Changed:
----------------
trunk/
trunk/src/libopenvrml/openvrml/bad_url.cpp
trunk/src/libopenvrml/openvrml/scene.cpp
trunk/src/libopenvrml/openvrml/scene.h
trunk/src/libopenvrml/openvrml/script.cpp
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
+ /branches/0.17:3713,3717,3719,3721,3725
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-06 21:39:13 UTC (rev 3725)
+++ trunk/ChangeLog 2008-10-06 21:46:04 UTC (rev 3726)
@@ -1,5 +1,18 @@
2008-10-06 Braden McDaniel <br...@en...>
+ Process org.openvrml.BrowserControl.service.in with sed (rather
+ than config.status) so that substitutions that expand to make
+ macros get fully resolved.
+
+ * configure.ac: Removed
+ src/openvrml-xembed/org.openvrml.BrowserControl.service from
+ AC_CONFIG_FILES.
+ * src/Makefile.am: Added rules to create
+ org.openvrml.BrowserControl.service from
+ org.openvrml.BrowserControl.service.in.
+
+2008-10-06 Braden McDaniel <br...@en...>
+
* doc/Makefile.am: install/distcheck fixes for javadoc
documentation.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-10-06 21:39:13 UTC (rev 3725)
+++ trunk/configure.ac 2008-10-06 21:46:04 UTC (rev 3726)
@@ -10,7 +10,6 @@
[models/textures/Makefile]
[lib/Makefile]
[src/Makefile]
- [src/openvrml-xembed/org.openvrml.BrowserControl.service]
[src/libopenvrml/openvrml-config.h]
[src/libopenvrml-gl/openvrml-gl-config.h]
[src/script/Makefile]
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-10-06 21:39:13 UTC (rev 3725)
+++ trunk/src/Makefile.am 2008-10-06 21:46:04 UTC (rev 3726)
@@ -698,6 +698,16 @@
--output=$@ \
$?
+edit = sed -e 's|@libexecdir[@]|$(libexecdir)|g'
+
+openvrml-xembed/org.openvrml.BrowserControl.service: Makefile
+ rm -f $@ $@.tmp
+ $(edit) '$(srcdir)/$@.in' > $@.tmp
+ chmod a-w $@.tmp
+ mv $@.tmp $@
+
+openvrml-xembed/org.openvrml.BrowserControl.service: $(srcdir)/openvrml-xembed/org.openvrml.BrowserControl.service.in
+
if ENABLE_PLAYER
bin_PROGRAMS = openvrml-player/openvrml-player
BUILT_SOURCES += \
Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725
Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725
Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725
Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|