[Pkg-scicomp-devel] trilinos/trunk

[Christophe Prud'homme]

SVN commit 1817 by prudhomm:

[svn-inject] Applying Debian modifications to trunk

 A             trilinos/trunk/.pc (directory)  
 A             trilinos/trunk/.pc/.version  
 A             trilinos/trunk/.pc/applied-patches  
 A             trilinos/trunk/.pc/destdir (directory)  
 A             trilinos/trunk/.pc/destdir/Makefile.am  
 M  +4 -4      trilinos/trunk/Makefile.am  
 M  +4 -4      trilinos/trunk/Makefile.in  
 M  +1 -0      trilinos/trunk/README  
 AM            trilinos/trunk/debian (directory)  
 A             trilinos/trunk/debian/README.Debian  
 A             trilinos/trunk/debian/changelog  
 A             trilinos/trunk/debian/compat  
 A             trilinos/trunk/debian/control  
 A             trilinos/trunk/debian/copyright  
 A             trilinos/trunk/debian/dirs  
 A             trilinos/trunk/debian/docs  
 A             trilinos/trunk/debian/libtrilinos8.0-dev.install  
 A             trilinos/trunk/debian/libtrilinos8.0-doc.docs  
 A             trilinos/trunk/debian/libtrilinos8.0-doc.examples  
 A             trilinos/trunk/debian/libtrilinos8.0.install  
 A             trilinos/trunk/debian/patches (directory)  
 A             trilinos/trunk/debian/patches/destdir  
 A             trilinos/trunk/debian/patches/series  
 A             trilinos/trunk/debian/python-pytrilinos8.0.install  
 AM            trilinos/trunk/debian/rules  
 A             trilinos/trunk/debian/watch  


--- trilinos/trunk/Makefile.am #1816:1817
@@ -111,12 +111,12 @@
 ## #######################################################################
 
 install-exec-hook:	
-	cp $(top_srcdir)/commonTools/buildTools/strip_dup_incl_paths.pl $(exec_prefix)/include/. ;
-	cp $(top_srcdir)/commonTools/buildTools/strip_dup_libs.pl $(exec_prefix)/include/.
+	cp $(top_srcdir)/commonTools/buildTools/strip_dup_incl_paths.pl $(DESTDIR)$(exec_prefix)/include/. ;
+	cp $(top_srcdir)/commonTools/buildTools/strip_dup_libs.pl $(DESTDIR)$(exec_prefix)/include/.
 
 uninstall-hook:
-	rm -f $(exec_prefix)/include/strip_dup_incl_paths.pl
-	rm -f $(exec_prefix)/include/strip_dup_libs.pl
+	rm -f $(DESTDIR)$(exec_prefix)/include/strip_dup_incl_paths.pl
+	rm -f $(DESTDIR)$(exec_prefix)/include/strip_dup_libs.pl
 
 
 #
--- trilinos/trunk/Makefile.in #1816:1817
@@ -681,12 +681,12 @@
 
 
 install-exec-hook:	
-	cp $(top_srcdir)/commonTools/buildTools/strip_dup_incl_paths.pl $(exec_prefix)/include/. ;
-	cp $(top_srcdir)/commonTools/buildTools/strip_dup_libs.pl $(exec_prefix)/include/.
+	cp $(top_srcdir)/commonTools/buildTools/strip_dup_incl_paths.pl $(DESTDIR)$(exec_prefix)/include/. ;
+	cp $(top_srcdir)/commonTools/buildTools/strip_dup_libs.pl $(DESTDIR)$(exec_prefix)/include/.
 
 uninstall-hook:
-	rm -f $(exec_prefix)/include/strip_dup_incl_paths.pl
-	rm -f $(exec_prefix)/include/strip_dup_libs.pl
+	rm -f $(DESTDIR)$(exec_prefix)/include/strip_dup_incl_paths.pl
+	rm -f $(DESTDIR)$(exec_prefix)/include/strip_dup_libs.pl
 
 runtests-serial :
 	$(PERL_EXE) $(TRILINOS_HOME_DIR)/commonTools/test/utilities/runtests \
--- trilinos/trunk/README #1816:1817
@@ -1,3 +1,4 @@
+
 ###############################################################################
 #                                                                             #
 # Trilinos README                                                             #
** trilinos/trunk/debian #property changes
Name: mergeWithUpstream
   + 1
** trilinos/trunk/debian/rules #property changes
Name: svn:executable
   + *