[openrtm-commit:02363] r2912 - in trunk/OpenRTM-aist: . docs

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-01-31 19:12:04 +0900 (Tue, 31 Jan 2017)
New Revision: 2912

Modified:
   trunk/OpenRTM-aist/configure.ac
   trunk/OpenRTM-aist/docs/Makefile.am
Log:
[compat,->RELENG_1_2] The installation of the deb package of openrtm-aist-example and openrtm-aist-doc has been changed. refs #3892

Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac	2017-01-31 03:01:14 UTC (rev 2911)
+++ trunk/OpenRTM-aist/configure.ac	2017-01-31 10:12:04 UTC (rev 2912)
@@ -1515,8 +1515,9 @@
 rtm_rtmdir=$rtm_libdir"/rtm"
 rtm_svcdir=$rtm_libdir"/svc"
 rtm_sdodir=$rtm_libdir"/sdo"
-rtm_docdir=$rtm_datadir"/doc"
-rtm_exampledir=$rtm_datadir"/example"
+rtm_cxx_docdir=$rtm_datadir"/doc/c++"
+rtm_idl_docdir=$rtm_datadir"/doc/idl"
+rtm_exampledir=$rtm_datadir"/components/c++/examples"
 
 AC_SUBST(rtm_libdir)
 AC_SUBST(rtm_datadir)
@@ -1528,7 +1529,8 @@
 AC_SUBST(rtm_rtmdir)
 AC_SUBST(rtm_svcdir)
 AC_SUBST(rtm_sdodir)
-AC_SUBST(rtm_docdir)
+AC_SUBST(rtm_cxx_docdir)
+AC_SUBST(rtm_idl_docdir)
 AC_SUBST(rtm_exampledir)
 
 dnl ------------------------------------------------------------

Modified: trunk/OpenRTM-aist/docs/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/docs/Makefile.am	2017-01-31 03:01:14 UTC (rev 2911)
+++ trunk/OpenRTM-aist/docs/Makefile.am	2017-01-31 10:12:04 UTC (rev 2912)
@@ -30,7 +30,7 @@
 doxygen_classref.conf:
 	sed -e 's/__VERSION__/$(VERSION)/g' doxygen_classref.conf.in > doxygen_classref.conf
 
-docdir = $(rtm_docdir)
+#docdir = $(rtm_docdir)
 
 EXTRA_DIST = \
 	doxygen_classref.conf \
@@ -52,40 +52,40 @@
 
 install-class-reference:
 	if test -d ClassReference; then \
-	  $(mkinstalldirs) $(DESTDIR)$(rtm_docdir)/ClassReference/html; \
+	  $(mkinstalldirs) $(DESTDIR)$(rtm_cxx_docdir)/ClassReference/html; \
 	  for x in ClassReference/html/*; do \
 	    if test -f $$x; then \
-	      $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_docdir)/ClassReference/html/;\
+	      $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_cxx_docdir)/ClassReference/html/;\
 	    fi \
 	  done \
 	fi
 
 install-class-reference-en:
 	if test -d ClassReference-en; then \
-	  $(mkinstalldirs) $(DESTDIR)$(rtm_docdir)/ClassReference-en/html; \
+	  $(mkinstalldirs) $(DESTDIR)$(rtm_cxx_docdir)/ClassReference-en/html; \
 	  for x in ClassReference-en/html/*; do \
 	    if test -f $$x; then \
-	      $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_docdir)/ClassReference-en/html/;\
+	      $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_cxx_docdir)/ClassReference-en/html/;\
 	    fi \
 	  done \
 	fi
 
 install-idl-reference:
 	if test -d IDLReference; then \
-	  $(mkinstalldirs) $(DESTDIR)$(rtm_docdir)/IDLReference/html; \
+	  $(mkinstalldirs) $(DESTDIR)$(rtm_idl_docdir)/IDLReference/html; \
 	  for x in IDLReference/html/*; do \
 	    if test -f $$x; then \
-	      $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_docdir)/IDLReference/html/;\
+	      $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_idl_docdir)/IDLReference/html/;\
 	    fi \
 	  done \
 	fi
 
 install-idl-reference-en:
 	if test -d IDLReference-en; then \
-	  $(mkinstalldirs) $(DESTDIR)$(rtm_docdir)/IDLReference-en/html; \
+	  $(mkinstalldirs) $(DESTDIR)$(rtm_idl_docdir)/IDLReference-en/html; \
 	  for x in IDLReference-en/html/*; do \
 	    if test -f $$x; then \
-	      $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_docdir)/IDLReference-en/html/;\
+	      $(INSTALL_DATA) $$x $(DESTDIR)$(rtm_idl_docdir)/IDLReference-en/html/;\
 	    fi \
 	  done \
 	fi