[Pkg-ace-commits] [pkg-ace] r698 - trunk/debian

[Thomas Girard]

Author: tgg
Date: 2010-06-05 17:04:17 +0000 (Sat, 05 Jun 2010)
New Revision: 698

Modified:
   trunk/debian/libtao-orbsvcs-dev.install
   trunk/debian/rules
Log:
Do not distribute unwanted headers.

This also removes directory structure mimicking the one from
the build under IFR_Service.


Modified: trunk/debian/libtao-orbsvcs-dev.install
===================================================================
--- trunk/debian/libtao-orbsvcs-dev.install	2010-06-05 16:59:51 UTC (rev 697)
+++ trunk/debian/libtao-orbsvcs-dev.install	2010-06-05 17:04:17 UTC (rev 698)
@@ -63,7 +63,6 @@
 usr/lib/libTAO_CosTime_Serv.so
 usr/lib/libTAO_CosTime_Skel.so
 usr/lib/libTAO_Catior_i.so
-usr/include/utils/catior
 usr/lib/libTAO_ReplicationManagerLib.so
 usr/lib/libTAO_ImR_Activator.so
 usr/lib/libTAO_ImR_Locator.so

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2010-06-05 16:59:51 UTC (rev 697)
+++ trunk/debian/rules	2010-06-05 17:04:17 UTC (rev 698)
@@ -6,8 +6,7 @@
 # Copyright (C) 2004  Raphael Bossek <bossekr at debian.org>
 # Copyright © 2005-2010 Thomas Girard <thomas.g.girard at free.fr>
 
-INSTALL := install -o root -g root
-INSTALL_755 := $(INSTALL) -m 755
+INSTALL_755 := install -o root -g root -m 755
 ACE_SUBDIR := ACE_wrappers
 ACE_ARCHIVE := $(shell ls -1 ACE+TAO+CIAO-src-*.tar.bz2 2>/dev/null || echo ace-archive-missing)
 MWCFLAGS := -type gnuace -noreldefs -genins
@@ -141,13 +140,13 @@
 	cd $(ACE_ROOT)/bin/PerlACE && ../../MPC/prj_install.pl -s script_files -b script_files=usr/lib/ace/bin/PerlACE $(CURDIR)/$(DT) PerlACE.ins
 
 #	Install TAO files in $(CURDIR)/$(DT)
-	for p in tao orbsvcs; do \
-	  cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_ALL) $(CURDIR)/$(DT) $$p; \
+	cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_ALL) $(CURDIR)/$(DT) tao
+	cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_ALL) $(CURDIR)/$(DT) orbsvcs/orbsvcs
+
+	for p in orbsvcs TAO_IDL utils; do \
+	  cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_BIN) $(CURDIR)/$(DT) $$p ; \
 	done
 
-	cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_BIN) $(CURDIR)/$(DT) TAO_IDL
-	cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_ALL) $(CURDIR)/$(DT) utils
-
 #	Install netsvcs files in $(CURDIR)/$(DT)
 	cd $(ACE_ROOT) && ./MPC/prj_install.pl $(PRJ_INSTALL_BIN) $(CURDIR)/$(DT) netsvcs
 	cd $(ACE_ROOT)/netsvcs/lib && ../../MPC/prj_install.pl -k -s header_files,inline_files,template_files  -b template_files=usr/include/netsvcs -b header_files=usr/include/netsvcs -b inline_files=usr/include/netsvcs $(CURDIR)/$(DT) .
@@ -159,10 +158,11 @@
 #	Move orbsvcs files from include/tao/orbsvcs into include/orbsvcs
 	cd $(CURDIR)/$(DT)/usr/include/orbsvcs && mv -f orbsvcs/* . && rm -rf orbsvcs  
 
-#	We provide scripts replacement for tao_idl and tao_ifr ; they
+#	We provide scripts replacement for tao_idl and tao_ifr; they
 #	automatically define ACE_ROOT and TAO_ROOT
 	mkdir -p $(DT)/usr/lib/ace/TAO
 	mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_ifr $(DT)/usr/lib/ace/TAO
+
 	$(INSTALL_755) -D debian/tao_idl $(DT)/usr/bin/tao_idl
 	$(INSTALL_755) -D debian/tao_ifr $(DT)/usr/bin/tao_ifr