[openrtm-commit:02785] r3028 - in trunk/OpenRTM-aist: examples/Analyzer src/lib/coil

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2017-08-30 12:03:40 +0900 (Wed, 30 Aug 2017)
New Revision: 3028

Removed:
   trunk/OpenRTM-aist/examples/Analyzer/rtc.conf
Modified:
   trunk/OpenRTM-aist/src/lib/coil/configure.ac
Log:
[compat,build] Adding -C/-p option to header install command. refs #4032

Deleted: trunk/OpenRTM-aist/examples/Analyzer/rtc.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Analyzer/rtc.conf	2017-08-30 03:02:35 UTC (rev 3027)
+++ trunk/OpenRTM-aist/examples/Analyzer/rtc.conf	2017-08-30 03:03:40 UTC (rev 3028)
@@ -1,12 +0,0 @@
-corba.nameservers: localhost
-naming.formats: %h.host_cxt/%n.rtc
-logger.enable: NO
-example.ConsoleOut.config_file: consout.conf
-example.ConsoleIn.config_file: consin.conf
-example.ConfigSample.config_file: configsample.conf
-
-## If you want to try to run Composite component, uncomment the following lines.
-# manager.modules.load_path: ./.libs/
-# manager.modules.preload: Controller.so, Motor.so, Sensor.so
-# manager.components.precreate: Controller, Motor, Sensor, PeriodicECSharedComposite
-# composite.PeriodicECShared.PeriodicECSharedComposite0.config_file: composite.conf

Modified: trunk/OpenRTM-aist/src/lib/coil/configure.ac
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/configure.ac	2017-08-30 03:02:35 UTC (rev 3027)
+++ trunk/OpenRTM-aist/src/lib/coil/configure.ac	2017-08-30 03:03:40 UTC (rev 3028)
@@ -445,6 +445,14 @@
 AC_SUBST(LDSOLIBS)
 AC_SUBST(pkgconfigdir)
 
+dnl Adding -C/-p option to header install command
+install_exists=`which install`
+if test "x$install_exists" = "x" ; then
+   AC_SUBST([INSTALL_HEADER], ['${INSTALL} -c -C -m 644'])
+else
+   AC_SUBST([INSTALL_HEADER], ['${INSTALL} -c -p -m 644'])
+fi
+
 dnl RTM version related options
 AC_SUBST(COIL_VERSION)
 AC_SUBST(COIL_MAJOR_VERSION)