[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20081201.dfsg-3-21-geaf3830

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 52ea69a8f6f57b269c1b39693a18af82c130bb05
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Aug 28 00:12:06 2009 +0200

    Refresh patch

diff --git a/debian/patches/0006-Do-not-install-non-existant-files.patch b/debian/patches/0006-Do-not-install-non-existant-files.patch
index cb4a337..707adf3 100644
--- a/debian/patches/0006-Do-not-install-non-existant-files.patch
+++ b/debian/patches/0006-Do-not-install-non-existant-files.patch
@@ -1,30 +1,22 @@
 From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 12 May 2009 17:51:22 +0200
+Date: Fri, 28 Aug 2009 00:14:42 +0200
 Subject: [PATCH] Do not install non-existant files
 
 ---
- Makefile.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 80a7bee..9e2aa76 100644
+index f4585bd..fbf5f4d 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -2037,13 +2037,13 @@ install:
- 	  $(CP) -R doc/manuals $(DESTDIR)$(datadir); \
-         fi
- 	if [ -d lib/plugins -a $(PLUGIN_DYN_EXISTS) = "yes" ]; then \
--	  $(CP)  $(PLUGIN_DYN_CMO_LIST) $(PLUGIN_DYN_CMX_LIST) \
--	         $(PLUGIN_DYN_GUI_CMO_LIST) $(PLUGIN_DYN_GUI_CMX_LIST) \
-+	  $(CP)  $(wildcard $(PLUGIN_DYN_CMO_LIST) $(PLUGIN_DYN_CMX_LIST) \
-+	         $(PLUGIN_DYN_GUI_CMO_LIST) $(PLUGIN_DYN_GUI_CMX_LIST)) \
- 		 $(DESTDIR)$(plugindir); \
- 	fi
+@@ -1483,7 +1483,7 @@ install-kernel:
+ 	$(MKDIR) $(FRAMAC_LIBDIR)
  # 	line below does not work if INCLUDES contains twice the same directory
  #       Do not attempt to copy gui interfaces if gui is disabled
--	$(CP) $(foreach d,$(filter-out $(FILTER_INTERFACE_DIRS),$(INCLUDES:-I%=%)), $(d)/*.cmi) $(DESTDIR)$(libdir)
-+	$(CP) $(wildcard $(foreach d,$(filter-out $(FILTER_INTERFACE_DIRS),$(INCLUDES:-I%=%)), $(d)/*.cmi)) $(DESTDIR)$(libdir)
- 	if [ "$(ENABLE_GUI)" = "yes" ]; then \
- 	  $(CP) src/gui/*.cmi $(DESTDIR)$(libdir); \
-         fi
+-	$(CP) $(foreach d,$(filter-out $(FILTER_INTERFACE_DIRS),$(INCLUDES:-I%=%)), $(d)/*.cmi) $(FRAMAC_LIBDIR)
++	$(CP) $(wildcard $(foreach d,$(filter-out $(FILTER_INTERFACE_DIRS),$(INCLUDES:-I%=%)), $(d)/*.cmi)) $(FRAMAC_LIBDIR)
+ 
+ install-gui:
+ 	$(PRINT_CP) gui API
 -- 

-- 
frama-c packaging