From 4a184a795285ea53a109c044fb68fb451ab04492 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Fri, 4 Oct 2002 14:06:28 +0000 Subject: [PATCH] * attila/src/Makefile.am, attila/src/attila.sh, attila/etc/attila.conf : - Le "sed" dans le Makefile.am etait trop violent : consequence attila se croyait toujours en etat d'auto-installation et ne lisait jamais "attila.conf". - Dans load_conf (attila.conf) on fesait tout les tests mais j'avais completement oublie de charger le fichier si c'est OK (la c'est vraiment minable). - Dans attila.conf, j'oubliais de checkouter "alliance/src/configure.in" donc, pour le premier outil on partait aux fraises. --- alliance/src/attila/etc/attila.conf | 9 ++++++++- alliance/src/attila/src/Makefile.am | 3 +-- alliance/src/attila/src/attila.sh | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/alliance/src/attila/etc/attila.conf b/alliance/src/attila/etc/attila.conf index 3a9206dd..2ce8ac30 100644 --- a/alliance/src/attila/etc/attila.conf +++ b/alliance/src/attila/etc/attila.conf @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: attila.conf,v 1.3 2002/09/30 18:30:05 jpc Exp $ +# $Id: attila.conf,v 1.4 2002/10/04 14:06:24 jpc Exp $ # # -*- Mode: Shell-script -*- # @@ -53,4 +53,11 @@ CVS_STARTUP_FILES="$CVS_STARTUP_FILES alliance.m4" CVS_STARTUP_FILES="$CVS_STARTUP_FILES motif.m4" CVS_STARTUP_FILES="$CVS_STARTUP_FILES xpm.m4" + CVS_STARTUP_FILES="$CVS_STARTUP_FILES configure.in" CVS_STARTUP_FILES="$CVS_STARTUP_FILES Makefile.am" +#CVS_STARTUP_FILES="$CVS_STARTUP_FILES install.sh" +#CVS_STARTUP_FILES="$CVS_STARTUP_FILES mkinstalldirs" +#CVS_STARTUP_FILES="$CVS_STARTUP_FILES missing" +#CVS_STARTUP_FILES="$CVS_STARTUP_FILES config.guess" +#CVS_STARTUP_FILES="$CVS_STARTUP_FILES config.sub" +#CVS_STARTUP_FILES="$CVS_STARTUP_FILES ltmain.sh" diff --git a/alliance/src/attila/src/Makefile.am b/alliance/src/attila/src/Makefile.am index 102e56e8..aa3c9374 100644 --- a/alliance/src/attila/src/Makefile.am +++ b/alliance/src/attila/src/Makefile.am @@ -4,8 +4,7 @@ bin_SCRIPTS = attila CLEANFILES = attila attila : ${srcdir}/attila.sh - ${SED} 's,__ALLIANCE_INSTALL_DIR__,$(prefix),' $< > $@ - chmod a+x $@ + ${SED} 's,="__ALLIANCE_INSTALL_DIR__"$$,="$(prefix)",' $< > $@ EXTRA_DIST = attila.sh diff --git a/alliance/src/attila/src/attila.sh b/alliance/src/attila/src/attila.sh index 6ffc3409..51dc0d2e 100755 --- a/alliance/src/attila/src/attila.sh +++ b/alliance/src/attila/src/attila.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: attila.sh,v 1.4 2002/10/01 14:02:11 jpc Exp $ +# $Id: attila.sh,v 1.5 2002/10/04 14:06:28 jpc Exp $ # # /------------------------------------------------------------------\ # | | @@ -226,6 +226,8 @@ exit 1 fi + + . "$ALLIANCE_TOP/etc/attila.conf" }