cifrado r59 - in trunk: . data

[bersace svn gnome org]

Author: bersace
Date: Wed Apr  2 10:44:51 2008
New Revision: 59
URL: http://svn.gnome.org/viewvc/cifrado?rev=59&view=rev

Log:
Largue distutils, migration totale vers les autotools, correction des autotools pour l'empaquetage.


Removed:
   trunk/setup.py.in
Modified:
   trunk/Makefile.am
   trunk/TODO
   trunk/configure.ac
   trunk/data/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Apr  2 10:44:51 2008
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS = --disable-desktop-update --disable-mime-update
+DISTCHECK_CONFIGURE_FLAGS = --disable-desktop-update --disable-mime-update --disable-scrollkeeper
 
 SUBDIRS = data package manuel
 
@@ -6,5 +6,4 @@
 
 EXTRA_DIST = \
 	$(bin_SCRIPTS) \
-	setup.py \
 	MANIFEST.in
\ No newline at end of file

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Wed Apr  2 10:44:51 2008
@@ -1,6 +1,4 @@
 
-* Fichiers rÃcemment utilisÃs
-
 * EmblÃmes de force
 
 * Option d'impression : police, ratio clair/chiffrÃ

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Apr  2 10:44:51 2008
@@ -51,7 +51,6 @@
 dnl EXÃCUTION
 AC_CONFIG_FILES([
 	Makefile
-	setup.py
 	cifrado
 	package/Makefile
 	package/cifrado/Makefile
@@ -62,6 +61,6 @@
 	manuel/Makefile
 	manuel/cifrado.omf
 	manuel/C/cifrado.xml
-])
+	])
 
 AC_OUTPUT
\ No newline at end of file

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Apr  2 10:44:51 2008
@@ -47,18 +47,34 @@
 
 install-data-hook: update-icon-cache
 if HAVE_FDO_MIME
-	$(UPDATE_MIME_DATABASE) "$(datadir)/mime"
+	if test -z "$(DESTDIR)" ; then \
+		$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"; \
+	else \
+		echo "**** Not updating MIME database"; \
+	fi
 endif
 
 if HAVE_FDO_DESKTOP
-	$(UPDATE_DESKTOP_DATABASE)
+	if test -z "$(DESTDIR)" ; then \
+		$(UPDATE_DESKTOP_DATABASE); \
+	else \
+		echo "**** Not updating desktop database"; \
+	fi
 endif
 
 uninstall-hook: update-icon-cache
 if HAVE_FDO_MIME
-	$(UPDATE_MIME_DATABASE) "$(datadir)/mime"
+	if test -z "$(DESTDIR)" ; then \
+		$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"; \
+	else \
+		echo "**** Not updating MIME database"; \
+	fi
 endif
 
 if HAVE_FDO_DESKTOP
-	$(UPDATE_DESKTOP_DATABASE)
+	if test -z "$(DESTDIR)" ; then \
+		$(UPDATE_DESKTOP_DATABASE); \
+	else \
+		echo "**** Not updating desktop database"; \
+	fi
 endif